diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch index 210e367d..a2b1e5e8 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6d1c296d6df2c5efd8aec3272e7eacae1c093885 Mon Sep 17 00:00:00 2001 | 1 | From e356895802c2a1e596882c79161994ebbf361d65 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: Wed, 17 Apr 2013 18:06:25 +0200 | 3 | Date: Wed, 17 Apr 2013 18:06:25 +0200 |
4 | Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check | 4 | Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check |
5 | 5 | ||
6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | 6 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value |
7 | 7 | ||
@@ -29,10 +29,10 @@ index 876f657..0e094a8 100644 | |||
29 | } | 29 | } |
30 | contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { | 30 | contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { |
31 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | 31 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf |
32 | index 5758604..37b50d4 100644 | 32 | index c110ea5..34ee9ca 100644 |
33 | --- a/mkspecs/features/qt_tool.prf | 33 | --- a/mkspecs/features/qt_tool.prf |
34 | +++ b/mkspecs/features/qt_tool.prf | 34 | +++ b/mkspecs/features/qt_tool.prf |
35 | @@ -36,8 +36,7 @@ load(qt_common) | 35 | @@ -15,8 +15,7 @@ CONFIG += console |
36 | 36 | ||
37 | # If we are doing a prefix build, create a "module" pri which enables | 37 | # If we are doing a prefix build, create a "module" pri which enables |
38 | # qtPrepareTool() to work with the non-installed build. | 38 | # qtPrepareTool() to work with the non-installed build. |