whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <paul.tvete@digia.com>
bb10
Eskil Abrahamsen Blomfeldt 2013-03-21 13:00:49 +01:00 committed by The Qt Project
parent e85524096d
commit ab18bb84e4
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/platforms/android/src/androidjnimain.cpp
View File

@ -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");

2
src/plugins/platforms/android/src/src.pri
View File

@ -1,6 +1,6 @@
load(qt_plugin)
QT += core-private gui-private widgets-private platformsupport-private
QT += core-private gui-private platformsupport-private
CONFIG += qpa/genericunixfontdatabase