diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2016-10-04 16:58:47 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2016-10-14 08:21:12 +0000 |
| commit | 9ebfacb6883a5ed0095b1c816f3441eab8b675aa (patch) | |
| tree | 59c9535a7aff25b3ea13b61b58dc2e777ab69f31 | |
| parent | fca0aa676e5288d2b867f24263059233253510b5 (diff) | |
Android: Re-enable asset extraction for styling
When the new configure system was introduced, it accidentally
disabled automatic extraction of style assets on Android.
This patch puts it back in.
Note that the style extraction is not specific to Qt Widgets,
but rather Qt Gui, like other QPA options.
Task-number: QTBUG-56328
Change-Id: Ica33c3562c6dd6483050075f5c8ed5d28cd621a4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/gui/configure.json | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/android/android.pro | 2 | ||||
| -rw-r--r-- | src/widgets/configure.json | 6 |
3 files changed, 7 insertions, 7 deletions
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).", |