diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:18:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | 42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d (patch) | |
tree | d04aaf16c9e9492586937186d48eb9f0dfa2631e /meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch | |
parent | 89386fde895a585c6322fc94b594c35a355555e7 (diff) | |
download | poky-42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d.tar.gz |
qt4: add 4.8.3 version with negative D_P
* rebased patches, 3 patches are resolved upstream:
0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
0022-webkit-fix-conflicting-types.patch
resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1
(From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a)
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.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch new file mode 100644 index 0000000000..21d5b4da19 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From fa9e376ff72f488608c8fc635ec669fc00c3c1ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Wed, 26 Sep 2012 20:29:09 +0200 | ||
4 | Subject: [PATCH 06/20] configure: Use OE_QMAKE_* values to specify Qt utility | ||
5 | paths | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure | 10 +++++----- | ||
13 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index cc08b71..958b884 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -8612,11 +8612,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE | ||
20 | QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc | ||
21 | |||
22 | #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR | ||
23 | -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc | ||
24 | -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic | ||
25 | -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 | ||
26 | -QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc | ||
27 | -QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp | ||
28 | +QMAKE_MOC = \${OE_QMAKE_MOC} | ||
29 | +QMAKE_UIC = \${OE_QMAKE_UIC} | ||
30 | +QMAKE_UIC3 = \${OE_QMAKE_UIC3} | ||
31 | +QMAKE_RCC = \${OE_QMAKE_RCC} | ||
32 | +QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP} | ||
33 | QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include | ||
34 | QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib | ||
35 | |||
36 | -- | ||
37 | 1.7.12 | ||
38 | |||