diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-02-27 14:01:57 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-02-27 14:11:38 +0100 |
| commit | 188de8046f59298cbe6f10d13bdff59beafe7c10 (patch) | |
| tree | faabb8d39b4f2fbd421807f2d1ec1a984c80d354 | |
| parent | c1f7f80ab95d27834b3cd038880addc2d2e53dff (diff) | |
qt-embedded: restore qtopia4core.bbclass, add qt4e.bbclass
| -rw-r--r-- | classes/qt4e.bbclass | 13 | ||||
| -rw-r--r-- | classes/qtopia4core.bbclass | 2 | ||||
| -rw-r--r-- | packages/qt4/qt-embedded_4.4.3.bb | 2 |
3 files changed, 15 insertions, 2 deletions
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 |