diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-09 21:36:58 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-09-09 21:36:58 +0000 |
| commit | 68c1896202e12376543b4bfafe48fc053f8d38b9 (patch) | |
| tree | 32e23849e500b26b4c3c523ae30f53e4b5734822 /classes | |
| parent | f13935215c790b58ba20b0bd570802288bf3f0b2 (diff) | |
| parent | 09d44c043f33b47b7d577f51a62bd414ea2e94aa (diff) | |
merge of '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'
and '7d51500e1f981f891b494ca3d396c965faecc9e0'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake_base.bbclass (renamed from classes/qmake-base.bbclass) | 2 | ||||
| -rw-r--r-- | classes/qt3e.bbclass | 2 | ||||
| -rw-r--r-- | classes/qt3x11.bbclass | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index b45e54ca6a..34f59ef9f7 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -1,4 +1,4 @@ -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake-native " diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 86f1439b30..d0f59d2cd4 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -1,7 +1,7 @@ # # QMake variables for Qt4 # -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " diff --git a/classes/qmake-base.bbclass b/classes/qmake_base.bbclass index 52f6d830a0..ea8903c278 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake_base.bbclass @@ -31,7 +31,7 @@ oe_qmake_mkspecs () { done } -qmake-base_do_configure() { +qmake_base_do_configure() { case ${QMAKESPEC} in *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) ;; diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index 58a6779af6..98c47adb90 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -1,5 +1,5 @@ # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3" export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3" diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 95ed4f538a..67f2cf7348 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,7 +1,7 @@ DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3" |