diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-13 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-13 01:00:15 +0200 |
| commit | 104f0535a16542e419ccba11bf9a08fb8cb4a1e2 (patch) | |
| tree | c7d277b202c0542c39a5085c812ab504a8c613e9 /mkspecs/features | |
| parent | 3d7207414b07104c1ea03ef341301a7390d7b0ad (diff) | |
| parent | 447ee95d5e050c5db1636c5d3bd0edbf59f26108 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Idcf8fc1d79bcd84b494d7f43308e6fe82d60e1a4
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index c00faf5aac..346fbf2467 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -300,7 +300,8 @@ mac { CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { qt_framework { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM}_debug + # Intentionally there is no '_debug' infix for framework builds. + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM} CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM} CMAKE_BUILD_IS_FRAMEWORK = "true" } else { |