packages/qt4/qt4-x11-free,qtopia-core: Change the order, move the config flags to...

diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc
index 74773cd..5b901a2 100644 (file)
--- a/packages/qt4/qt4-x11-free.inc
+++ b/packages/qt4/qt4-x11-free.inc
@@ -15,11 +15,12 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz
 S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 
+QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
 QT_BASE_NAME = "qt4"
 QT_BASE_LIB  = "libqt"
 QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qt4"
-require qt_packaging.inc
 require qt_depends.inc
+require qt_packaging.inc
 
 inherit qt4x11

diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc
index 3789cc7..204378a 100644 (file)
--- a/packages/qt4/qtopia-core.inc
+++ b/packages/qt4/qtopia-core.inc
@@ -12,11 +12,14 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.ta
 S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
 
 
+QT_CONFIG_FLAGS += " \
+    -nomake demos -nomake examples -nomake tools \
+    -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
 QT_BASE_NAME = "qtopiacore"
 QT_BASE_LIB  = "libqtopiacore"
 QT_LIBRARY_NAME = "libQt"
 QT_DIR_NAME = "qtopia"
-require qt_packaging.inc
 require qt_depends.inc
+require qt_packaging.inc
 
 inherit qtopia4core