summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-08 08:45:13 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-08 08:45:13 +0000
commite7023c0251b23f1dd4941f5e0e0374881ac2b646 (patch)
treed55c9837ddbbdd876e5a67c05d997e6abeb8ca04
parent2a95775a0433f7ef2ab6474758e1683d730d0cf6 (diff)
qte 4.4.0: don't build tools, use the ones in staging
-rw-r--r--packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch11
-rw-r--r--packages/qt4/qt-embedded_4.4.0.bb2
2 files changed, 12 insertions, 1 deletions
diff --git a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch b/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
new file mode 100644
index 0000000000..21e9fffe5e
--- /dev/null
+++ b/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch
@@ -0,0 +1,11 @@
+--- /tmp/src.pro 2008-07-08 10:43:30.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro 2008-07-08 10:44:04.000000000 +0200
+@@ -6,7 +6,7 @@
+ wince*:{
+ SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+- SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+ contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+ contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+ !cross_compile {
diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.0.bb
index f04453bea9..027c049f46 100644
--- a/packages/qt4/qt-embedded_4.4.0.bb
+++ b/packages/qt4/qt-embedded_4.4.0.bb
@@ -3,7 +3,7 @@ require qtopia-core.inc
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
file://qconfig-oe.h \
file://0001-cross-compile.patch;patch=1 \
-# file://0003-no-tools.patch;patch=1 \
+ file://0003-no-tools.patch;patch=1 \
file://0004-no-qmake.patch;patch=1 \
file://0005-fix-mkspecs.patch;patch=1 \
file://build-tools.patch;patch=1"