diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-25 09:26:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-26 07:45:38 +0000 |
commit | d4f557ae7c0e82b589ee5282d37360911efd2593 (patch) | |
tree | 65adc885745ce5a5bfd451e88724fff170c91efe /recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |
parent | bd7a586d835d1dd0a5b201338e223fb94adc4380 (diff) | |
download | meta-qt5-d4f557ae7c0e82b589ee5282d37360911efd2593.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.12(.3) branch
Task-number: QTBUG-74623
Change-Id: I58e0d192658129922a463ccbf9e3c0f247c973a0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index b4e98a3f..68cca92a 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 852a06e11ece7b1a74785bdea2235583d0275007 Mon Sep 17 00:00:00 2001 | 1 | From f39cf06f1242fc8391561bbbfb0741fbd58194f1 Mon Sep 17 00:00:00 2001 |
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | 2 | From: Max Krummenacher <max.krummenacher@toradex.com> |
3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 | 3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 |
4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to | 4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to |
@@ -19,7 +19,7 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | |||
19 | 1 file changed, 8 insertions(+), 14 deletions(-) | 19 | 1 file changed, 8 insertions(+), 14 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in | 21 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in |
22 | index 07869efd7d..671aa82167 100644 | 22 | index 84dbbfe..ad6956d 100644 |
23 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in | 23 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in |
24 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in | 24 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in |
25 | @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) | 25 | @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) |
@@ -48,9 +48,9 @@ index 07869efd7d..671aa82167 100644 | |||
48 | -!!ENDIF | 48 | -!!ENDIF |
49 | + | 49 | + |
50 | foreach(_lib ${Libs}) | 50 | foreach(_lib ${Libs}) |
51 | string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) | 51 | if (IS_ABSOLUTE ${_lib}) |
52 | if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) | 52 | get_filename_component(_libFile ${_lib} NAME_WE) |
53 | @@ -158,11 +152,11 @@ endmacro() | 53 | @@ -171,11 +165,11 @@ endmacro() |
54 | 54 | ||
55 | 55 | ||
56 | !!IF !isEmpty(CMAKE_EGL_LIBS) | 56 | !!IF !isEmpty(CMAKE_EGL_LIBS) |