diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 16:05:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-06 16:05:48 (GMT) |
| commit | 8bc5a6319455d7dc0655a8c48862ada8890b0064 (patch) | |
| tree | 2f43d23e5a30e9f2c18698038291c74254db480a /src/plugins/graphicssystems | |
| parent | 013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f (diff) | |
| parent | 156893a247f1c24094129b6f5151c8b821d8b1b5 (diff) | |
| download | Qt-8bc5a6319455d7dc0655a8c48862ada8890b0064.zip Qt-8bc5a6319455d7dc0655a8c48862ada8890b0064.tar.gz Qt-8bc5a6319455d7dc0655a8c48862ada8890b0064.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/plugins/graphicssystems')
| -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 3423d2c..94efc2f 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 |