diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-23 10:13:28 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-23 10:13:29 +0100 |
| commit | e3da05f39a5b000bbb6194396d688bf26af771fd (patch) | |
| tree | 6b1e0b84a2ef9b7abdd465c0aecb5688fcb40f1a /src/android | |
| parent | 0c007a87be88f44151616b7251cfed5508913e0f (diff) | |
| parent | 9822d57d858068cfe5a07281ef069ef8c4c7b7b3 (diff) | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: Icebd151eae0cf9d400319a42573290d1a911ce26
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java | 2 |
1 files changed, 1 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 7826527918..ae9ccc09db 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 @@ -612,7 +612,7 @@ public abstract class QtLoader { } if (m_qtLibs != null) { - String libPrefix = apkDeployFromSystem ? libsDir + "lib" : localPrefix + "lib/lib"; + String libPrefix = libsDir + "lib"; for (int i = 0; i < m_qtLibs.length; i++) libraryList.add(libPrefix + m_qtLibs[i] + ".so"); } |