diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-07-01 16:01:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 10:04:12 +0200 |
| commit | daa28042dfc551c65b38404fad600dab1222bf44 (patch) | |
| tree | 99ad554b4b9e5b650dcbb098ec68c42f942aeefc /tests/auto/android | |
| parent | 3168c94577cc604fd033ce4e741da5c411f74666 (diff) | |
Update native functions to match signature in platform plugin
We just pass 1.0 as the scaled density for now, since it shouldn't
make much different to the code being tested.
Task-number: QTBUG-32079
Change-Id: I888c4640e4627f47a2c128d2ce2a41adf4ca3132
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'tests/auto/android')
| -rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtNative.java | 13 |
1 files changed, 9 insertions, 4 deletions
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 |