diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 06:52:22 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-08 06:52:22 +0000 |
commit | 4cee9928f25926581c5bfcffeb648d89e0b232ec (patch) | |
tree | e4b3d5109b177a607c2275ed4729ea0a23e0d45c /src/plugins/platforms/android/qandroidplatformscreen.cpp | |
parent | 0d4232f53100eb04f8aa85ea2a7aee395baf337f (diff) | |
parent | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformscreen.cpp')
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index dd9140d498..7a509e4d61 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -256,7 +256,7 @@ void QAndroidPlatformScreen::applicationStateChanged(Qt::ApplicationState state) foreach (QAndroidPlatformWindow *w, m_windowStack) w->applicationStateChanged(state); - if (state <= Qt::ApplicationHidden && QtAndroid::blockEventLoopsWhenSuspended()) { + if (state <= Qt::ApplicationHidden) { lockSurface(); QtAndroid::destroySurface(m_id); m_id = -1; |