diff options
| -rw-r--r-- | configure.json | 3 | ||||
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.json b/configure.json index 1cb30c989e..4316b57c05 100644 --- a/configure.json +++ b/configure.json @@ -1090,8 +1090,7 @@ "output": [ { "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" }, { "type": "publicQtConfig", "name": "qt_framework"}, - { "type": "publicConfig", "name": "qt_framework"}, - { "type": "publicConfig", "negative": true, "name": "qt_no_framework"} + { "type": "publicConfig", "name": "qt_framework"} ] }, "largefile": { 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" |