diff --git a/src/gui/configure.json b/src/gui/configure.json index 318efe5401..b361679101 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -7,6 +7,7 @@ "commandline": { "options": { + "android-style-assets": "boolean", "angle": "boolean", "directfb": "boolean", "directwrite": "boolean", @@ -414,6 +415,11 @@ "condition": "features.accessibility && features.xcb && features.dbus", "output": [ "privateFeature", "feature" ] }, + "android-style-assets": { + "label": "Android Style Assets", + "condition": "config.android", + "output": [ "privateFeature" ] + }, "angle": { "label": "ANGLE", "autoDetect": "features.opengles2 || features.opengl-dynamic", diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 045e55ec65..544b2ca63a 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -72,7 +72,7 @@ HEADERS += $$PWD/qandroidplatformintegration.h \ $$PWD/qandroidplatformforeignwindow.h \ $$PWD/qandroideventdispatcher.h -android-style-assets: SOURCES += $$PWD/extract.cpp +qtConfig(android-style-assets): SOURCES += $$PWD/extract.cpp else: SOURCES += $$PWD/extract-dummy.cpp PLUGIN_TYPE = platforms diff --git a/src/widgets/configure.json b/src/widgets/configure.json index c1931d9d80..b241fcdf11 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -8,7 +8,6 @@ "commandline": { "options": { - "android-style-assets": "boolean", "gtk": { "type": "boolean", "name": "gtk3" }, "style-windows": "boolean", "style-windowsxp": "boolean", @@ -78,11 +77,6 @@ "condition": "features.style-windows && features.properties && features.cssparser", "output": [ "publicFeature", "feature" ] }, - "android-style-assets": { - "label": "Android Style Assets", - "condition": "features.style-android", - "output": [ "privateConfig" ] - }, "effects": { "label": "Effects", "purpose": "Provides special widget effects (e.g. fading and scrolling).",