AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Also support android style for debug deployment

Browse Source 
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>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2014-08-14 12:58:45 +02:00 committed by Shawn Rutledge
parent b35176f43a
commit 3e0a6c1b36
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
View File

@ -634,14 +634,12 @@ public class QtActivity extends Activity
loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList); loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList);
if (bundlingQtLibs) { String themePath = getApplicationInfo().dataDir + "/qt-reserved-files/android-style/";
String themePath = pluginsPrefix + "android-style/"; String stylePath = themePath + m_displayDensity + "/";
String stylePath = themePath + m_displayDensity + "/"; if (!(new File(stylePath)).exists())
if (!(new File(stylePath)).exists()) loaderParams.putString(EXTRACT_STYLE_KEY, stylePath);
loaderParams.putString(EXTRACT_STYLE_KEY, stylePath); ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath
ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath + "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath;
+ "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath;
}
loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES
+ "\tQML2_IMPORT_PATH=" + pluginsPrefix + "/qml" + "\tQML2_IMPORT_PATH=" + pluginsPrefix + "/qml"