summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2014-08-14 12:58:45 +0200
committerShawn Rutledge <shawn.rutledge@digia.com>2014-08-16 23:27:40 +0200
commit3e0a6c1b3698226e8f64d6e737d83a725fc970d9 (patch)
tree078fd517e310d1a89e1fae60c27ec879668fecfd /src
parentb35176f43a953d56380414f05834c7918762cb83 (diff)
Android: Also support android style for debug deployment
Both bundling and debug deployment can use the local cache for the Android style assets, since Ministro is not necessarily available in these cases. Change-Id: I33367aceec1829f27377fcb6793ca95ecf5cc434 Task-number: QTBUG-40676 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
index c70f1d1aaf..e526c0a210 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -634,14 +634,12 @@ public class QtActivity extends Activity
loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList);
- if (bundlingQtLibs) {
- String themePath = pluginsPrefix + "android-style/";
- String stylePath = themePath + m_displayDensity + "/";
- if (!(new File(stylePath)).exists())
- loaderParams.putString(EXTRACT_STYLE_KEY, stylePath);
- ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath
- + "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath;
- }
+ String themePath = getApplicationInfo().dataDir + "/qt-reserved-files/android-style/";
+ String stylePath = themePath + m_displayDensity + "/";
+ if (!(new File(stylePath)).exists())
+ loaderParams.putString(EXTRACT_STYLE_KEY, stylePath);
+ ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath
+ + "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath;
loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES
+ "\tQML2_IMPORT_PATH=" + pluginsPrefix + "/qml"