diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 11:03:36 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-03 12:04:28 +0100 |
| commit | 1ec312f314343f287956dcab5482571039a94ff1 (patch) | |
| tree | 604453191dd176e0b53f42eb538be017496235b7 /classes | |
| parent | 63057a32d7b877c39b85eb3e9168c6fd7e4ce579 (diff) | |
| download | meta-openembedded-contrib-1ec312f314343f287956dcab5482571039a94ff1.tar.gz | |
qt4: import files from OE
This gives us both qt4-x11 and qt4-embedded; qt4-x11 was already present in yocto, but was lacking features
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qt4e.bbclass | 17 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 9 |
2 files changed, 26 insertions, 0 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass new file mode 100644 index 0000000000..303b79b8a6 --- /dev/null +++ b/classes/qt4e.bbclass @@ -0,0 +1,17 @@ +DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-embedded')]}" +inherit qmake2 + +QT_DIR_NAME = "qtopia" +QT_LIBINFIX = "E" +# override variables set by qmake-base to compile Qt/Embedded apps +# +export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "" +export OE_QMAKE_EXTRA_MODULES = "network" +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " + +# Qt4 uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass new file mode 100644 index 0000000000..abb1d9d2e4 --- /dev/null +++ b/classes/qt4x11.bbclass @@ -0,0 +1,9 @@ +DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}" + +inherit qmake2 + +QT_DIR_NAME = "qt4" +QT_LIBINFIX = "" + +# Qt4 uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" |