summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-05-02 12:55:00 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-05-03 11:03:12 +0300
commit89ac66bf3969b48eb771ef4c06a0b8df00fd178a (patch)
treeb929ba359171175a23f3c10bb4ba199b00c17f4a /recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
parentf087aeb1e988fcb0597fcf2b27981b1803909276 (diff)
parent8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (diff)
downloadmeta-qt5-89ac66bf3969b48eb771ef4c06a0b8df00fd178a.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior: 8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch 7dc422d qtwayland: check also that the destination for private headers exists before installing them 84d647a qtwayland: improve manual header installation 3d60f9a qtwayland: workaround upstream bug: install missing headers manually eb5d6da qtwayland: disable gold for all archs like in qtbase e2707a0 qt5: upgrade to 5.12.3 0778424 qtbase: disable gold for all archs not just x86 4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase 8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks a4bf240 qtbase-native: add native libdir to search path adf7f60 qt5: patch build paths from installed files 28d4bfd Upgrade to 5.12.2 5a32838 layer.conf: Add warrior to compatible release series Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I085dfdddbf7915f776bd48a6d26ecf96777d9d19
Diffstat (limited to 'recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
new file mode 100644
index 00000000..0a641bb2
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -0,0 +1,66 @@
1From f5c88622ac10601e48a14f31d9299692a9ac62e2 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Sat, 27 Oct 2018 12:29:31 +0000
4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
5 sysroot
6
7EGL is configured to need an include path into the recipe-specific sysroot.
8However users of the cmake file will have a different absolute path than that
9used when creating the cmake file from cmake.in in qtbase.
10
11Change to store the relative path within the sysroot and then prepend the
12currently used sysroot in the _qt5gui_find_extra_libs macro.
13
14Upstream-Status: Inappropriate [OE specific]
15
16Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
17---
18 src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++--------------
19 1 file changed, 8 insertions(+), 14 deletions(-)
20
21diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
22index 84dbbfebd4..ad6956d814 100644
23--- a/src/gui/Qt5GuiConfigExtras.cmake.in
24+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
25@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
26
27 macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
28 set(Qt5Gui_${Name}_LIBRARIES)
29-!!IF !mac
30- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs})
31-!!ELSE
32+
33 foreach(_dir ${IncDirs})
34- if (EXISTS ${_dir})
35- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir})
36- else()
37- find_path(_actual_dir ${_dir}) # Look in sdk directories
38- if (_actual_dir)
39- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
40- endif()
41- unset(_actual_dir CACHE)
42+ find_path(_actual_dir ${_dir})
43+ if (_actual_dir)
44+ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
45 endif()
46+ unset(_actual_dir CACHE)
47 endforeach()
48-!!ENDIF
49+
50 foreach(_lib ${Libs})
51 if (IS_ABSOLUTE ${_lib})
52 get_filename_component(_libFile ${_lib} NAME_WE)
53@@ -171,11 +165,11 @@ endmacro()
54
55
56 !!IF !isEmpty(CMAKE_EGL_LIBS)
57-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\")
58+_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\")
59 !!ENDIF
60
61 !!IF !isEmpty(CMAKE_OPENGL_LIBS)
62-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\")
63+_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\")
64
65 !!ENDIF
66