From ab18bb84e45513e71d78681150a58db7b2e6afad Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 21 Mar 2013 13:00:49 +0100 Subject: Remove QtWidgets dependency from Android platform plugin The setFullScreen() function was never called from anywhere, so it was just removed. The update() loop for top level widgets has been replaced by a loop sending expose events to top level windows. Task-number: QTBUG-29313 Change-Id: Ic31a05ad3a0693f1d3f61457cee9d78f6b334b4d Reviewed-by: Paul Olav Tvete --- .../platforms/android/src/androidjnimain.cpp | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'src/plugins/platforms/android/src/androidjnimain.cpp') diff --git a/src/plugins/platforms/android/src/androidjnimain.cpp b/src/plugins/platforms/android/src/androidjnimain.cpp index f8f077908c..ae94e75e34 100644 --- a/src/plugins/platforms/android/src/androidjnimain.cpp +++ b/src/plugins/platforms/android/src/androidjnimain.cpp @@ -126,8 +126,6 @@ static int m_desktopHeightPixels = 0; static volatile bool m_pauseApplication; -static jmethodID m_setFullScreenMethodID = 0; - static AndroidAssetsFileEngineHandler *m_androidAssetsFileEngineHandler = 0; @@ -272,24 +270,6 @@ namespace QtAndroid return m_androidPlatformIntegration; } - void setFullScreen(QWidget *widget) - { - AttachedJNIEnv env; - if (!env.jniEnv) - return; - - bool fullScreen = widget->isFullScreen(); - if (!fullScreen) { - foreach (QWidget *w, qApp->topLevelWidgets()) { - fullScreen |= w->isFullScreen(); - if (fullScreen) - break; - } - } - - env.jniEnv->CallStaticVoidMethod(m_applicationClass, m_setFullScreenMethodID, fullScreen); - } - QWindow *topLevelWindowAt(const QPoint &globalPos) { return m_androidPlatformIntegration @@ -674,9 +654,9 @@ static void updateWindow(JNIEnv */*env*/, jobject /*thiz*/) if (!m_androidPlatformIntegration) return; - if (qApp != 0) { - foreach (QWidget *w, qApp->topLevelWidgets()) - w->update(); + if (QGuiApplication::instance() != 0) { + foreach (QWindow *w, QGuiApplication::topLevelWindows()) + QWindowSystemInterface::handleExposeEvent(w, QRegion(w->geometry())); } #ifndef ANDROID_PLUGIN_OPENGL @@ -763,7 +743,6 @@ static int registerNatives(JNIEnv *env) } GET_AND_CHECK_STATIC_METHOD(m_redrawSurfaceMethodID, m_applicationClass, "redrawSurface", "(IIII)V"); - GET_AND_CHECK_STATIC_METHOD(m_setFullScreenMethodID, m_applicationClass, "setFullScreen", "(Z)V"); #ifdef ANDROID_PLUGIN_OPENGL FIND_AND_CHECK_CLASS("android/view/Surface"); -- cgit v1.2.3