summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2017-05-02 12:25:24 +0300
committerBogDan Vatra <bogdan@kdab.com>2017-05-03 09:43:12 +0000
commit0fefed996c267677a0c8ec6fbd3052f0f3a7720e (patch)
tree41af5ecf03e817da5d30a4c9e35b72b8a65b3f38 /src/android
parenta30c746ea41046462cfd02ba2978c040f6b87aa7 (diff)
Fix different look when running the application second time
The problem was introduced in Qt 5.7. Task-number: QTBUG-60297 Change-Id: I46265b24e104e08fe5b8026e5441514a438582c9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
index aeac2448bb..69f351033d 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
@@ -608,9 +608,11 @@ public abstract class QtLoader {
if (!(new File(stylePath)).exists() && !extractOption.equals("none")) {
loaderParams.putString(EXTRACT_STYLE_KEY, stylePath);
loaderParams.putBoolean(EXTRACT_STYLE_MINIMAL_KEY, extractOption.equals("minimal"));
- if (extractOption.equals("full"))
- ENVIRONMENT_VARIABLES += "\tQT_USE_ANDROID_NATIVE_STYLE=1";
}
+
+ if (extractOption.equals("full"))
+ ENVIRONMENT_VARIABLES += "\tQT_USE_ANDROID_NATIVE_STYLE=1";
+
ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath
+ "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath;