summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-06-27 10:56:50 +0200
committerLars Knoll <lars.knoll@qt.io>2016-07-05 15:48:58 +0000
commit8ca247e287963802f59af1c3243467792f18ba31 (patch)
tree9762fff318d4929d88bbb1e45b5c7f11d11e4171 /mkspecs
parent27be7c764e22e5e3b03c73db26150f2740095c04 (diff)
Get rid of the qt_no_framework setting in the CONFIG variable
It's only used in one place, where it's actually not required either. Change-Id: I5766d2b5f0c1083bbd58a9b9fb07cc67bbd46a94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/create_cmake.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 78356b4437..1099e14b17 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -208,7 +208,7 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
- CONFIG(qt_framework, qt_framework|qt_no_framework) {
+ qt_framework {
CMAKE_LIB_FILE_LOCATION_DEBUG = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
CMAKE_BUILD_IS_FRAMEWORK = "true"