diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 08:51:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 08:51:11 (GMT) |
| commit | fd5acfc663383c38e4d0993a4163023d46137e32 (patch) | |
| tree | abf247eae2e410af800aedeb5d30d4f5529d9f7b | |
| parent | e07f691ff700399b4e24eb618d64e9522a8ab430 (diff) | |
| parent | 8e4fecb730fda4dac801b4f8e618ecae8103c00c (diff) | |
| download | Qt-fd5acfc663383c38e4d0993a4163023d46137e32.zip Qt-fd5acfc663383c38e4d0993a4163023d46137e32.tar.gz Qt-fd5acfc663383c38e4d0993a4163023d46137e32.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:
Fixed bug in meego graphics system runtime switching.
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 69a6922..412d521 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -124,14 +124,14 @@ void QMeeGoGraphicsSystemSwitchHandler::addWidget(QWidget *widget) void QMeeGoGraphicsSystemSwitchHandler::handleMapNotify() { - if (m_widgets.isEmpty() && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) + if (QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch && visibleWidgets() == 0) QTimer::singleShot(0, this, SLOT(switchToMeeGo())); } void QMeeGoGraphicsSystemSwitchHandler::removeWidget(QObject *object) { m_widgets.removeOne(static_cast<QWidget *>(object)); - if (m_widgets.isEmpty() && QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch) + if (QMeeGoGraphicsSystem::switchPolicy == QMeeGoGraphicsSystem::AutomaticSwitch && visibleWidgets() == 0) QTimer::singleShot(0, this, SLOT(switchToRaster())); } |