diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:16:06 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:22:05 +0200 |
commit | 35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch) | |
tree | d640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch | |
parent | 81b7031859176f24c028c7234d795812bd1a3c95 (diff) | |
download | meta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz |
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
used in recipes
* 0004-Disable-mkv8snapshot.patch and
0005-AddSynchoronization-qimagereader.patch are special, because they
are applied only to 5.0.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..c639c172 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 892351a55c3f6a033a1823e104315cb0f03b454d Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 | ||
4 | Subject: [PATCH 06/12] Allow building a separate qmake for the target | ||
5 | |||
6 | Upstream-Status: Inappropriate [config] | ||
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.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 0d92ac2..9be0e9b 100644 | ||
17 | --- a/qmake/qmake.pro | ||
18 | +++ b/qmake/qmake.pro | ||
19 | @@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic | ||
20 | DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ | ||
21 | PROEVALUATOR_FULL PROEVALUATOR_DEBUG | ||
22 | DESTDIR = ../bin/ | ||
23 | +TARGET = qmake | ||
24 | |||
25 | OBJECTS_DIR = . | ||
26 | MOC_DIR = . | ||
27 | -- | ||
28 | 1.8.2.1 | ||
29 | |||