summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-02 10:32:23 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-04 12:05:55 +0000
commitce5d960aee8876fc3b879b98cf4699f3e131f4b7 (patch)
treebd2a7a867cdcfcc51e768150c31eaa38fff0182c
parentd1997972350c67b8e6dad46824424466aca79d37 (diff)
Use qtbase optimize_size configure option
The optimize-size configure option got landed generally in qtbase, so respond to that instead of doing our own. Change-Id: I8bfcf494a6f0d599bf375ae4ea73ce86ee02216b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--configure.json7
-rw-r--r--mkspecs/features/configure.prf4
2 files changed, 3 insertions, 8 deletions
diff --git a/configure.json b/configure.json
index 0c9a1de6..805ed400 100644
--- a/configure.json
+++ b/configure.json
@@ -8,7 +8,6 @@
"options": {
"alsa": "boolean",
"embedded": "boolean",
- "optimize-for-size": { "type": "boolean", "name": "optimize_size" },
"ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
"opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } },
"webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } },
@@ -90,11 +89,6 @@
"purpose": "Enables the embedded build configuration",
"output": [ "privateFeature" ]
},
- "optimize_size": {
- "label": "Optimize for size",
- "autoDetect": "tests.embedded",
- "output": [ "privateFeature" ]
- },
"alsa": {
"label": "ALSA",
"condition": "config.unix && libs.alsa",
@@ -180,7 +174,6 @@
"section": "Qt WebEngine",
"entries": [
"embedded",
- "optimize_size",
"pepper-plugins",
"printing-and-pdf",
"proprietary-codecs",
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index f60be817..9b0be014 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -30,7 +30,6 @@ defineTest(runConfigure) {
qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker
qtConfig(webrtc): WEBENGINE_CONFIG += use_webrtc
qtConfig(embedded): WEBENGINE_CONFIG += embedded_build
- qtConfig(optimize_size): WEBENGINE_CONFIG += reduce_binary_size
qtConfig(system-webp): WEBENGINE_CONFIG += use_system_libwebp
else: WEBENGINE_CONFIG += use_bundled_libwebp
qtConfig(system-opus): WEBENGINE_CONFIG += use_system_opus
@@ -42,6 +41,9 @@ defineTest(runConfigure) {
}
isQtMinimum(5, 9) {
qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code
+ optimize_size: WEBENGINE_CONFIG += reduce_binary_size
+ } else {
+ qtConfig(embedded): WEBENGINE_CONFIG += reduce_binary_size
}
linux {