summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-06-17 10:17:56 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-17 10:17:56 +0200
commit98813ead02c7f3bf2ba89c8540630d4f2d0ea844 (patch)
treea3d6a5c2ace038078fb4f7efc93e3081516fff58 /mkspecs
parent1632786f00875d23c7d111cbb29dedaa35c1c8c2 (diff)
parentfc9ae22c88dd085c7c31599037132fc756feeb04 (diff)
Merge remote-tracking branch 'origin/5.13.0' into 5.13
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index 1c4994c30f..705e0a3c93 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -59,7 +59,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
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 \"[ \\t]+\" \";\" _standard_libraries ${CMAKE_CXX_STANDARD_LIBRARIES})
+ 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}\")
foreach(_flag ${_static_depends})