diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:25 +0100 |
| commit | 84e15d6f485fe0e9a4549d57ef39dbc3d18eeaa9 (patch) | |
| tree | b02e4541aac42302504b244f856062bda902cd0d /mkspecs/features/create_cmake.prf | |
| parent | c6153660e458ee3790a446a327d29e622defee49 (diff) | |
| parent | 607338f98feaa2561340c7ff4249d470b36d0503 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic0037eac1d85a0e60e7b1a590d49b5ee6205bfc8
Diffstat (limited to 'mkspecs/features/create_cmake.prf')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 2ed708e085..6bf1380716 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -200,7 +200,9 @@ CMAKE_QT5_MODULE_DEPS = $$join(lib_deps, ";") CMAKE_INTERFACE_MODULE_DEPS = $$join(aux_mod_deps, ";") CMAKE_INTERFACE_QT5_MODULE_DEPS = $$join(aux_lib_deps, ";") -CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX} +# TARGET here is the one changed at the end of qt_module.prf, +# which already contains the Qt5 prefix and QT_LIBINFIX suffix +CMAKE_QT_STEM = $${TARGET} mac { !isEmpty(CMAKE_STATIC_TYPE) { |