diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-05 14:37:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-05 14:37:20 (GMT) |
| commit | 8bfcd87139550fd23159f066713274a8c41ad6dc (patch) | |
| tree | 886305ad4f8b4473e1df2556df336a5d4e6afe3b /src | |
| parent | 6adc6f500e1d2f65a493a76baf35c5f11180edeb (diff) | |
| parent | eecc9d287c6d9db62b24ee2c80eb994a5552e41f (diff) | |
| download | Qt-8bfcd87139550fd23159f066713274a8c41ad6dc.zip Qt-8bfcd87139550fd23159f066713274a8c41ad6dc.tar.gz Qt-8bfcd87139550fd23159f066713274a8c41ad6dc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes switching runtime graphics system when the maximized window is shown or hidden.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 6268d4b..a034b0e 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -174,6 +174,14 @@ bool QMeeGoGraphicsSystemSwitchHandler::eventFilter(QObject *object, QEvent *eve QMeeGoGraphicsSystem::switchToMeeGo(); } } + } else if (event->type() == QEvent::Show + && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) { + if (visibleWidgets() > 0) + QMeeGoGraphicsSystem::switchToMeeGo(); + } else if (event->type() == QEvent::Hide + && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) { + if (visibleWidgets() == 0) + QMeeGoGraphicsSystem::switchToRaster(); } // resume processing of event |