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>
This commit is contained in:
parent
fca0aa676e
commit
9ebfacb688
@ -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",
|
||||
|
@ -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
|
||||
|
@ -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).",
|
||||
|
Loading…
Reference in New Issue
Block a user