summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-04-23 21:55:14 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-24 16:29:40 +0200
commit5c7e4d302e289e464ccf22b6640812dc51c5bf3f (patch)
treeabf7b2840ce4b742df5fe2c69a1f19018259bd58 /mkspecs
parent161d38182694ce35c0b94c712baece42ff4a9d13 (diff)
Fix creation of config files in debug mode.
f88212c22f7e4bec261130a6f82294adfc75abca was not complete. Change-Id: Ie5b1bb4832176ec8a72ace473f7dbc6c4de10ff2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/create_cmake.prf18
1 files changed, 16 insertions, 2 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index a7c9110af0..120c96746d 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -113,8 +113,22 @@ macx {
CMAKE_DEBUG_TYPE =
CMAKE_RELEASE_TYPE =
-debug_and_release:CONFIG(debug,debug|release):CMAKE_DEBUG_TYPE = debug
-debug_and_release|CONFIG(release,debug|release):CMAKE_RELEASE_TYPE = release
+# Requirements:
+# * If Qt is configured with -debug, we're creating debug libraries and not
+# release libraries, regardless of whether we're on a platform where
+# debug_and_release is true.
+# * If Qt is configured with -release, we're creating release libraries and not
+# debug libraries, regardless of whether we're on a platform where
+# debug_and_release is true.
+# * If Qt is configured with neither -debug nor -release, and we are on a
+# platform where debug_and_release is true, we're creating both
+# debug and release libraries.
+# * If Qt is configured with -debug on a platform where debug_and_release is
+# true, and 'make release' is subsequently invoked, CMake is only aware of
+# the debug libraries at build time.
+
+if (build_all|CONFIG(debug, debug|release)):CMAKE_DEBUG_TYPE = debug
+if (build_all|CONFIG(release, debug|release)):CMAKE_RELEASE_TYPE = release
INSTALLS += cmake_qt5_module_files