qt-embedded: restore qtopia4core.bbclass, add qt4e.bbclass

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
new file mode 100644 (file)
index 0000000..3fac2bd
--- /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 3fac2bd..b5f10fa 100644 (file)
--- 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 088300f..24f45a1 100644 (file)
--- 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