AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of the qt_no_framework setting in the CONFIG variable

Browse Source 
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>
This commit is contained in:
Lars Knoll 2016-06-27 10:56:50 +02:00
parent 27be7c764e
commit 8ca247e287
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.json
View File

@ -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": {

2
mkspecs/features/create_cmake.prf
View File

@ -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"