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/0012-configure.prf-Allow-to-add-extra-arguments-to-make.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/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 5d7cbc34..00000000 --- a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From b0a008c649f76e0353f49f9c953e9d8141e5927a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 9 May 2013 10:06:50 +0200 | ||
4 | Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make | ||
5 | |||
6 | * sometimes we would like to add -e or define some variable and respect it from both | ||
7 | Makefiles used in configure tests and also Makefiles to build the application | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | mkspecs/features/configure.prf | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | ||
17 | index 39144e7..de48b07 100644 | ||
18 | --- a/mkspecs/features/configure.prf | ||
19 | +++ b/mkspecs/features/configure.prf | ||
20 | @@ -54,12 +54,12 @@ defineTest(qtCompileTest) { | ||
21 | qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" | ||
22 | |||
23 | # Clean up after previous run | ||
24 | - exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") | ||
25 | + exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") | ||
26 | |||
27 | mkpath($$test_out_dir)|error("Aborting.") | ||
28 | |||
29 | qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { | ||
30 | - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { | ||
31 | + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { | ||
32 | log("yes$$escape_expand(\\n)") | ||
33 | msg = "test $$1 succeeded" | ||
34 | write_file($$QMAKE_CONFIG_LOG, msg, append) | ||
35 | -- | ||
36 | 1.8.2.1 | ||
37 | |||