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>

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

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 {