summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-07-04 09:50:32 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:44:13 +0100
commit0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch)
treedbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b /meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
parent262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff)
downloadpoky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz
qt4: upgrade to 4.8.5
Removed patches integrated upstream. Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. (From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
new file mode 100644
index 0000000000..ec07f41403
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
@@ -0,0 +1,29 @@
1From 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:32:41 +0200
4Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the
5 target
6
7Upstream-Status: Inappropriate [config]
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 qmake/qmake.pro | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
16index 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--
281.8.0
29