diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-07 23:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-07 23:00:14 (GMT) |
| commit | e7d9b0e9961de39590ffdee4d6a168e612ae7826 (patch) | |
| tree | ed835ee599eb2b5bc929ead33d36d5f921204e15 /src/plugins | |
| parent | 997c2dfed7a04da2fac577f1c29b89bda4939e2d (diff) | |
| parent | 233a146ae575de76e55abe2dc30bcde3b5570f23 (diff) | |
| download | Qt-e7d9b0e9961de39590ffdee4d6a168e612ae7826.zip Qt-e7d9b0e9961de39590ffdee4d6a168e612ae7826.tar.gz Qt-e7d9b0e9961de39590ffdee4d6a168e612ae7826.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/plugins')
| -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 |