diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 11:24:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-27 14:39:22 +0000 |
| commit | 29ac40d6cda0d6e13bb1e47bc4fd1cc282afcab3 (patch) | |
| tree | f1df070fa0eb71c90b47773957b08a759271b950 /configure.json | |
| parent | 2f7e940e8398664a84a8b50d88e17948a00e9195 (diff) | |
Correct framework config options to remain as they used to
Commit 90eee08b3e672573e3ad93470d844e1d498651dd 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>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 1d6aa3fe8b..6246485164 100644 --- a/configure.json +++ b/configure.json @@ -1062,9 +1062,9 @@ "description": "Build Apple Frameworks", "condition": "config.darwin && features.shared", "output": [ - "publicQtConfig", - "publicConfig", { "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"} ] }, |