From 3e0a6c1b3698226e8f64d6e737d83a725fc970d9 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 14 Aug 2014 12:58:45 +0200 Subject: 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 --- .../src/org/qtproject/qt5/android/bindings/QtActivity.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/android') 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" -- cgit v1.2.3