diff options
| author |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
| commit | dd53c790d6c3b19bff547755f804e5f2fccc56ed (patch) | |
| tree | 592f015c44735d719e52f57c86533cbf6981ca14 /classes | |
| parent | 6be41f1374dc9bf7f53673273d8b02bfbfe6a02e (diff) | |
| parent | b765ebc700bd5b639f70ccf2268284be624f46df (diff) | |
| download | openembedded-dd53c790d6c3b19bff547755f804e5f2fccc56ed.tar.gz | |
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
Conflicts:
classes/qt4e.bbclass
packages/bluez/bluez4_4.31.bb
packages/mc/mc_4.6.2.bb
packages/vte/vte.inc
packages/vte/vte_0.16.13.bb
packages/vte/vte_0.16.14.bb
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qt4e.bbclass | 6 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 3fac2bda9b..8beef29df4 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -2,8 +2,7 @@ DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-em inherit qmake2 QT_DIR_NAME = "qtopia" -# -# override variables set by qmake-base to compile QtopiaCore apps +# override variables set by qmake-base to compile Qt/Embedded apps # export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" @@ -11,3 +10,6 @@ export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " + +# Qt4 uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 76a45c33cb..923717f8af 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,3 +1,6 @@ DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}" inherit qmake2 + +# Qt4 uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" |