diff options
Diffstat (limited to 'tests/auto/android')
-rwxr-xr-x | tests/auto/android/runtests.pl | 1 | ||||
-rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java | 2 | ||||
-rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtNative.java | 13 |
3 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/android/runtests.pl b/tests/auto/android/runtests.pl index 7bb6833859..35cadda498 100755 --- a/tests/auto/android/runtests.pl +++ b/tests/auto/android/runtests.pl @@ -232,6 +232,7 @@ if ($deploy_qt) print ("cp -L $_ $temp_dir/lib\n"); system("cp -L $_ $temp_dir/lib"); } + system("cp -L $android_ndk_dir/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/libgnustl_shared.so $temp_dir/lib"); system("cp -a plugins $temp_dir"); system("cp -a imports $temp_dir"); system("cp -a qml $temp_dir"); diff --git a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java index 6242f55488..cefca44ae5 100644 --- a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java +++ b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java @@ -102,6 +102,7 @@ public class QtActivity extends Activity { } if (getIntent().getExtras().containsKey("lib_name")) { mainLib = getIntent().getExtras().getString("lib_name"); + libraryList.add(mainLib); int slash = mainLib.lastIndexOf("/"); if (slash >= 0) { nativeLibDir = mainLib.substring(0, slash+1); @@ -120,6 +121,7 @@ public class QtActivity extends Activity { // TODO Auto-generated catch block e.printStackTrace(); } + finish(); System.exit(0); } String[] libs = new String[libraryList.size()]; diff --git a/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java b/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java index d9995e3178..a61543d31a 100644 --- a/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java +++ b/tests/auto/android/src/org/qtproject/qt5/android/QtNative.java @@ -164,7 +164,8 @@ public class QtNative extends Application m_displayMetricsDesktopWidthPixels, m_displayMetricsDesktopHeightPixels, m_displayMetricsXDpi, - m_displayMetricsYDpi); + m_displayMetricsYDpi, + 1.0); startQtApplication(f.getAbsolutePath()+"\t"+params, environment); m_started = true; } @@ -183,7 +184,7 @@ public class QtNative extends Application synchronized (m_mainActivityMutex) { if (m_started) { - setDisplayMetrics(screenWidthPixels, screenHeightPixels, desktopWidthPixels, desktopHeightPixels, XDpi, YDpi); + setDisplayMetrics(screenWidthPixels, screenHeightPixels, desktopWidthPixels, desktopHeightPixels, XDpi, YDpi, 1.0); } else { m_displayMetricsScreenWidthPixels = screenWidthPixels; m_displayMetricsScreenHeightPixels = screenHeightPixels; @@ -379,8 +380,12 @@ public class QtNative extends Application // screen methods public static native void setDisplayMetrics(int screenWidthPixels, - int screenHeightPixels, int desktopWidthPixels, - int desktopHeightPixels, double XDpi, double YDpi); + int screenHeightPixels, + int desktopWidthPixels, + int desktopHeightPixels, + double XDpi, + double YDpi, + double scaledDensity); public static native void handleOrientationChanged(int newOrientation); // screen methods |