diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 11:48:09 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 15:25:25 +0200 |
commit | f8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch) | |
tree | 2da2a4be9b5aff64e54a818a19a8939266eed05f /recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch | |
parent | f52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff) | |
download | meta-qt5-f8b065ea1174dd1fa7d93359f6826bfc9d23174c.tar.gz |
qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of
changes in .inc files and we have only one version of modules without
release (only one _git.bb) and it's impossible to find SRCREV which
would be compatible with all 4 versions.
* 0005-AddSynchoronization-qimagereader.patch was already backported to
5.0.2 in upstream
* 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was
already applied in 5.0.2
* 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in
qt5-versions.inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index 319aae6f..00000000 --- a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 240fb45541c06103e8a930beeb5ee59a15b529bf 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 05/12] 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 | |||