summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:13:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:27 +0100
commitb0862a5cf2ba2878e7fefa5193acae3a82ea46fd (patch)
tree2281286b22e424616e1889a6077fcd6d5415dbec /meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
parentee14710dbf1c4383ca20851529684f164883cc80 (diff)
downloadpoky-b0862a5cf2ba2878e7fefa5193acae3a82ea46fd.tar.gz
qt4: move patches from files to qt4-4.8.1
* faster lookup in FILESPATH as small bonus (From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
new file mode 100644
index 0000000000..45208ec415
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure-paths.patch
@@ -0,0 +1,26 @@
1Use OE_QMAKE_* values to specify Qt utility paths
2
3Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
4Upstream-Status: Inappropriate [configuration]
5
6Index: qt-everywhere-opensource-src-4.6.3/configure
7===================================================================
8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
9+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000
10@@ -7198,11 +7198,11 @@
11 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
12
13 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
14-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
15-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
16-QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
17-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
18-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
19+QMAKE_MOC = \${OE_QMAKE_MOC}
20+QMAKE_UIC = \${OE_QMAKE_UIC}
21+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
22+QMAKE_RCC = \${OE_QMAKE_RCC}
23+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
24 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
25 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
26