From 92e0122dcc77ea28f4bd8c2b7688e699258c9656 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 27 Feb 2009 12:45:26 +0100 Subject: qtopia4core.bbclass: depend qt-embedded, qtopia-core is obsolete --- classes/qtopia4core.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index b5f10fa486..3fac2bda9b 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}" +DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-embedded')]}" inherit qmake2 QT_DIR_NAME = "qtopia" -- cgit 1.2.3-korg From 188de8046f59298cbe6f10d13bdff59beafe7c10 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 27 Feb 2009 14:01:57 +0100 Subject: qt-embedded: restore qtopia4core.bbclass, add qt4e.bbclass --- classes/qt4e.bbclass | 13 +++++++++++++ classes/qtopia4core.bbclass | 2 +- packages/qt4/qt-embedded_4.4.3.bb | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 classes/qt4e.bbclass (limited to 'classes') diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass new file mode 100644 index 0000000000..3fac2bda9b --- /dev/null +++ b/classes/qt4e.bbclass @@ -0,0 +1,13 @@ +DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-embedded')]}" +inherit qmake2 + +QT_DIR_NAME = "qtopia" +# +# override variables set by qmake-base to compile QtopiaCore apps +# +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" +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=E " diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 3fac2bda9b..b5f10fa486 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -1,4 +1,4 @@ -DEPENDS_prepend = "${@["qt-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt-embedded')]}" +DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}" inherit qmake2 QT_DIR_NAME = "qtopia" diff --git a/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb index 088300fda5..24f45a11eb 100644 --- a/packages/qt4/qt-embedded_4.4.3.bb +++ b/packages/qt4/qt-embedded_4.4.3.bb @@ -45,4 +45,4 @@ require qt_configuration.inc require qt_packaging.inc require qt_staging.inc -inherit qtopia4core +inherit qt4e -- cgit 1.2.3-korg From 19d7f35751b114882725ab88c9316dcecb497a93 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Fri, 27 Feb 2009 20:05:29 +0100 Subject: qt4[e|x11].bbclass: set ARM_INSTRUCTION_SET to arm --- classes/qt4e.bbclass | 6 +++++- classes/qt4x11.bbclass | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 3fac2bda9b..3f89fa9da3 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -3,7 +3,7 @@ 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 +11,7 @@ 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" -- cgit 1.2.3-korg