Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/corelib/io/qiodevice_p.h
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qguiapplication.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp

Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a

1 files changed, 2 insertions, 2 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 0859318fe1..4c2e612238 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
@@ -450,7 +450,7 @@ public class QtActivity extends Activity
     {
         ArrayList<String> libs = new ArrayList<String>();
 
-        String dataDir = getApplicationInfo().dataDir + "/";
+        String libsDir = getApplicationInfo().nativeLibraryDir + "/";
 
         long packageVersion = -1;
         try {
@@ -485,7 +485,7 @@ public class QtActivity extends Activity
 
                 for (String bundledImportBinary : list) {
                     String[] split = bundledImportBinary.split(":");
-                    String sourceFileName = dataDir + "lib/" + split[0];
+                    String sourceFileName = libsDir + split[0];
                     String destinationFileName = pluginsPrefix + split[1];
                     createBundledBinary(sourceFileName, destinationFileName);
                 }