diff options
author | Eric Hameleers <alien@slackware.com> | 2019-07-11 23:48:46 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-07-11 23:48:46 +0200 |
commit | 87322d6e92cc7ea8a0db547f371a1f589364c405 (patch) | |
tree | 21dc20379861c4212040cd07281a7a1b25190fe2 /deps/qt5/patches/qt5.qt5uitoolsconfig.patch | |
parent | 02106f5916fdaac770435f5ed81ee53a7214d516 (diff) | |
download | ktown-87322d6e92cc7ea8a0db547f371a1f589364c405.tar.gz ktown-87322d6e92cc7ea8a0db547f371a1f589364c405.tar.xz |
Deps: qt5 updated to 5.13.0
Diffstat (limited to 'deps/qt5/patches/qt5.qt5uitoolsconfig.patch')
-rw-r--r-- | deps/qt5/patches/qt5.qt5uitoolsconfig.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/deps/qt5/patches/qt5.qt5uitoolsconfig.patch b/deps/qt5/patches/qt5.qt5uitoolsconfig.patch new file mode 100644 index 0000000..1a0da5b --- /dev/null +++ b/deps/qt5/patches/qt5.qt5uitoolsconfig.patch @@ -0,0 +1,17 @@ +The fix for https://bugreports.qt.io/browse/QTBUG-76244 was not complete. +Further quoting is needed to deal with empty variables. +-- Eric Hameleers <alien@slackware.com> + +--- qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-06-13 06:18:18.000000000 +0200 ++++ qt-everywhere-src-5.13.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-09 19:37:15.253291684 +0200 +@@ -57,8 +57,8 @@ + + if(EXISTS \"${prl_file_location}\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") +- string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings}) +- string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends}) ++ string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends \"${_prl_strings}\") ++ string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends \"${_static_depends}\") + string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") + set(_search_paths) + string(REPLACE \"\\$\\$[QT_INSTALL_LIBS]\" \"${_qt5_install_libs}\" _static_depends \"${_static_depends}\") |