summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/files/configure-paths.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-01-14 12:02:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 16:25:11 +0000
commit7a0c927c99a540dd2bbdc3f614d57904abb487cb (patch)
tree943aad5eb675adb28842dc5da9819836ae1322f6 /meta/recipes-qt/qt4/files/configure-paths.patch
parent0e6608ba8810c1062c569a8c94aae7e4cba99f09 (diff)
downloadpoky-7a0c927c99a540dd2bbdc3f614d57904abb487cb.tar.gz
qt4: Add qt4-tools-nativesdk based on qt4-tools-sdk from OpenEmbedded
Differences from OpenEmbedded qt4-tools-sdk: * Convert to nativesdk and make fixes necessary to build * Use .inc file in 4.6.3 version * Add LIC_FILES_CHKSUM * Fix LICENSE to match other Qt4 recipes * Use http source URL to match other Qt4 recipes * Whitespace fixes Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/files/configure-paths.patch')
-rw-r--r--meta/recipes-qt/qt4/files/configure-paths.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/files/configure-paths.patch
new file mode 100644
index 0000000000..c9259a1159
--- /dev/null
+++ b/meta/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