summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt/qt4/files/configure-paths.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-03-17 21:41:22 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-03-17 21:41:22 +0100
commitc58cc7d3796dcee6e93885c835ed04cb566abeb2 (patch)
tree3eea4d4ef6a4ef79e0f4e025d7012c1a5cc38835 /meta-oe/recipes-qt/qt4/files/configure-paths.patch
parenteec6ab97f712e06eb52c9f7c99e19ffab3ce9d74 (diff)
downloadmeta-openembedded-c58cc7d3796dcee6e93885c835ed04cb566abeb2.tar.gz
move layer into meta-oe in preparation for future splits
As per TSC decision 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, 21 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/configure-paths.patch b/meta-oe/recipes-qt/qt4/files/configure-paths.patch
new file mode 100644
index 0000000000..c9259a1159
--- /dev/null
+++ b/meta-oe/recipes-qt/qt4/files/configure-paths.patch
@@ -0,0 +1,21 @@
1Index: qt-everywhere-opensource-src-4.6.3/configure
2===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
4+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000
5@@ -7198,11 +7198,11 @@
6 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
7
8 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
9-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
10-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
11-QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
12-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
13-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
14+QMAKE_MOC = \${OE_QMAKE_MOC}
15+QMAKE_UIC = \${OE_QMAKE_UIC}
16+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
17+QMAKE_RCC = \${OE_QMAKE_RCC}
18+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
19 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
20 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
21