diff --git a/configure.json b/configure.json index 0c9a1de64e89a341e2265eac83ee603813540e2a..805ed400124dd4c9c86706db68245c02d0010ab3 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 f60be817c4e222f1fc3d0de212e538881aaed0f9..9b0be0140097fd08855a465d7061238c906150e8 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 {