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/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.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/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch new file mode 100644 index 0000000000..d945025eba --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From dacee47b11fc7cf89cdb8ddeeac9e6b64320ec8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Wed, 26 Sep 2012 20:32:41 +0200 | ||
4 | Subject: [PATCH 08/20] qmake.pro: Allow building a separate qmake for the | ||
5 | target | ||
6 | |||
7 | Upstream-Status: Inappropriate [config] | ||
8 | |||
9 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | qmake/qmake.pro | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro | ||
16 | index 38e0fce..53b1ffb 100644 | ||
17 | --- a/qmake/qmake.pro | ||
18 | +++ b/qmake/qmake.pro | ||
19 | @@ -7,6 +7,7 @@ CONFIG += console bootstrap | ||
20 | CONFIG -= qt shared app_bundle uic | ||
21 | DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED | ||
22 | DESTDIR = ../bin/ | ||
23 | +TARGET = qmake2 | ||
24 | |||
25 | OBJECTS_DIR = . | ||
26 | MOC_DIR = . | ||
27 | -- | ||
28 | 1.7.12 | ||
29 | |||