Correct framework config options to remain as they used to

Commit 90eee08b3e changed how framework
config was defined, subtlely breaking Qt framework builds.

Task-number: QTBUG-54361
Change-Id: Ie7670d900d9eb4c2adb52ca1cd0f60f22acf8b81
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-06-27 11:24:49 +02:00 committed by Oswald Buddenhagen
parent 2f7e940e83
commit 29ac40d6cd

View File

@ -1062,9 +1062,9 @@
"description": "Build Apple Frameworks", "description": "Build Apple Frameworks",
"condition": "config.darwin && features.shared", "condition": "config.darwin && features.shared",
"output": [ "output": [
"publicQtConfig",
"publicConfig",
{ "type": "define", "name": "QT_MAC_FRAMEWORK_BUILD" }, { "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", "negative": true, "name": "qt_no_framework"}
] ]
}, },