diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch index 6c67dcf104..676e2857d7 100644 --- a/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch +++ b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 9516fc4260f701c6d9db0c341bb36480362e1747 Mon Sep 17 00:00:00 2001 | 1 | From d4a78e8739e845c2963666f7ef6a6c7a89827988 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Thu, 5 Jul 2018 10:26:48 -0300 | 3 | Date: Thu, 5 Jul 2018 10:26:48 -0300 |
4 | Subject: [PATCH 4/5] Fail silently if system Qt installation is broken | 4 | Subject: [PATCH] Fail silently if system Qt installation is broken |
5 | Organization: O.S. Systems Software LTDA. | ||
6 | 5 | ||
7 | Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the | 6 | Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the |
8 | following error if the system Qt installation is broken: | 7 | following error if the system Qt installation is broken: |
@@ -23,12 +22,13 @@ within the if(QT_QTCORE_FOUND) statement. | |||
23 | 22 | ||
24 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> | 23 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
25 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 24 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
25 | |||
26 | --- | 26 | --- |
27 | Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- | 27 | Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- |
28 | 1 file changed, 20 insertions(+), 19 deletions(-) | 28 | 1 file changed, 20 insertions(+), 19 deletions(-) |
29 | 29 | ||
30 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake | 30 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
31 | index 7ad981879..8b6f43cda 100644 | 31 | index 7e18243..497d5c3 100644 |
32 | --- a/Modules/FindQt4.cmake | 32 | --- a/Modules/FindQt4.cmake |
33 | +++ b/Modules/FindQt4.cmake | 33 | +++ b/Modules/FindQt4.cmake |
34 | @@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND | 34 | @@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND |
@@ -77,6 +77,3 @@ index 7ad981879..8b6f43cda 100644 | |||
77 | 77 | ||
78 | foreach(QT_MODULE ${QT_MODULES}) | 78 | foreach(QT_MODULE ${QT_MODULES}) |
79 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) | 79 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) |
80 | -- | ||
81 | 2.18.0 | ||
82 | |||