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/0006-Allow-building-a-separate-qmake-for-the-target.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/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, 0 insertions, 29 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 deleted file mode 100644 index c639c172..00000000 --- a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
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 | |||