diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-13 15:18:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 15:18:02 +0200 |
commit | 6370c3aa719bd7c1327cef88d263841ba28bb010 (patch) | |
tree | 46960631e7abbeaa40e019f6e31c2be5a18e6b92 /src/plugins/platforms/android/androidjnimain.cpp | |
parent | b9a32351c8582ede87b6c63967f5c832c0622645 (diff) | |
parent | ef416e0faaa83cd122038db397dd24d949c9cafe (diff) | |
download | qtbase-6370c3aa719bd7c1327cef88d263841ba28bb010.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Also bump minimum required Qt version for Android: Ministro updates.
Conflicts:
src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
src/plugins/platforms/android/androidjnimain.cpp
Change-Id: I966f249bebf92da37bfdeb995ad21b027eb03301
Diffstat (limited to 'src/plugins/platforms/android/androidjnimain.cpp')
-rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index c79198d7fe..2614bb52a8 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -635,6 +635,11 @@ static void updateWindow(JNIEnv */*env*/, jobject /*thiz*/) if (QGuiApplication::instance() != nullptr) { const auto tlw = QGuiApplication::topLevelWindows(); for (QWindow *w : tlw) { + + // Skip non-platform windows, e.g., offscreen windows. + if (!w->handle()) + continue; + QRect availableGeometry = w->screen()->availableGeometry(); if (w->geometry().width() > 0 && w->geometry().height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0) QWindowSystemInterface::handleExposeEvent(w, QRegion(QRect(QPoint(), w->geometry().size()))); |