summaryrefslogtreecommitdiffstats
path: root/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-08 13:56:16 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-08 13:56:17 +0100
commit812bb236dd1622896b6a0ca9bbe1334a69855aa2 (patch)
tree94031beabaf904e2380740cec8951b3c1152203c /src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
parent79d78d814acad4e183e281aea9b131f396abe3fb (diff)
parent50117d738af526cbfbd5afa50b9a501acb0fb9ce (diff)
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Diffstat (limited to 'src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java3
1 files changed, 2 insertions, 1 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 99c4ecca07..6e92e64028 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
@@ -569,7 +569,8 @@ public abstract class QtLoader {
boolean bundlingQtLibs = false;
if (m_contextInfo.metaData.containsKey("android.app.bundle_local_qt_libs")
&& m_contextInfo.metaData.getInt("android.app.bundle_local_qt_libs") == 1) {
- localPrefix = m_context.getApplicationInfo().dataDir + "/";
+ File dataDir = new File(m_context.getApplicationInfo().dataDir);
+ localPrefix = dataDir.getCanonicalPath() + "/";
pluginsPrefix = localPrefix + "qt-reserved-files/";
if (libsDir == null)