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/0004-qmake-is-already-built-in-qtbase-native.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/0004-qmake-is-already-built-in-qtbase-native.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index f934cf1d..00000000 --- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | ||
4 | Subject: [PATCH 04/11] qmake is already built in qtbase-native | ||
5 | |||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 50f1ef2..8710c28 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() | ||
20 | |||
21 | |||
22 | # build qmake | ||
23 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
24 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
25 | echo "Creating qmake. Please wait..." | ||
26 | |||
27 | mkdir -p "$outpath/qmake" || exit | ||
28 | -- | ||
29 | 1.8.2.1 | ||
30 | |||