aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt/qt4/files/configure-paths.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-06-13 15:46:52 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-06-19 19:25:25 +0200
commit608afbe8283c111964bef1246854edfd89ccee75 (patch)
tree4703da59836cebbf2168f2696e8fb38c44bf722e /meta-oe/recipes-qt/qt4/files/configure-paths.patch
parent4c3feb6a4fba60771891c857ff946c9eaadba9ea (diff)
downloadmeta-openembedded-contrib-608afbe8283c111964bef1246854edfd89ccee75.tar.gz
qt4: replace recipes with bbappends
The only functional difference between these recipes and the ones in oe-core is the addition of PostgreSQL, MySQL and SQLite 2 drivers. Now that we have QT_SQL_DRIVER_FLAGS in the oe-core Qt4 recipes we can replace the overlayed recipes with bbappends which enable the drivers using this variable. (Note: there is no bbappend for qt4-tools-native as this does not build the SQL drivers.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-qt/qt4/files/configure-paths.patch')
-rw-r--r--meta-oe/recipes-qt/qt4/files/configure-paths.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/configure-paths.patch b/meta-oe/recipes-qt/qt4/files/configure-paths.patch
deleted file mode 100644
index c9259a1159..0000000000
--- a/meta-oe/recipes-qt/qt4/files/configure-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.3/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
-+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000
-@@ -7198,11 +7198,11 @@
- QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
-
- #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
--QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
--QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
--QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
--QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
--QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-+QMAKE_MOC = \${OE_QMAKE_MOC}
-+QMAKE_UIC = \${OE_QMAKE_UIC}
-+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
-+QMAKE_RCC = \${OE_QMAKE_RCC}
-+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
- QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
- QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
-