diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch index e8a7784b..66eb898f 100644 --- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 828eecd8f361cb965bd40f535435efa91665c8e5 Mon Sep 17 00:00:00 2001 | 1 | From 28fa609f9726993dd5b52de45c3458a1bdff6149 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 9 May 2013 10:06:50 +0200 | 3 | Date: Thu, 9 May 2013 10:06:50 +0200 |
4 | Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make | 4 | Subject: [PATCH 07/17] configure.prf: Allow to add extra arguments to make |
5 | 5 | ||
6 | * sometimes we would like to add -e or define some variable and respect it from both | 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 | 7 | Makefiles used in configure tests and also Makefiles to build the application |
@@ -14,11 +14,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 16 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
17 | index 39144e7..de48b07 100644 | 17 | index fe41c54..e2db923 100644 |
18 | --- a/mkspecs/features/configure.prf | 18 | --- a/mkspecs/features/configure.prf |
19 | +++ b/mkspecs/features/configure.prf | 19 | +++ b/mkspecs/features/configure.prf |
20 | @@ -54,12 +54,12 @@ defineTest(qtCompileTest) { | 20 | @@ -60,12 +60,12 @@ defineTest(qtCompileTest) { |
21 | qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" | 21 | } |
22 | 22 | ||
23 | # Clean up after previous run | 23 | # Clean up after previous run |
24 | - exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") | 24 | - exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") |
@@ -33,5 +33,5 @@ index 39144e7..de48b07 100644 | |||
33 | msg = "test $$1 succeeded" | 33 | msg = "test $$1 succeeded" |
34 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 34 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
35 | -- | 35 | -- |
36 | 1.8.5.3 | 36 | 2.0.0 |
37 | 37 | ||