diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
commit | b764d3e6cb114988394e7500236ba087a3385a50 (patch) | |
tree | bee07ca38829fcc684e2e8db02ed398acb9d7bcf /src/plugins | |
parent | 97902c7f81228fa669acc6e075681dc05b404b1a (diff) | |
parent | 9507cbffb31b5ee4bfd9b4d2584406a2346fb668 (diff) | |
download | Qt-b764d3e6cb114988394e7500236ba087a3385a50.zip Qt-b764d3e6cb114988394e7500236ba087a3385a50.tar.gz Qt-b764d3e6cb114988394e7500236ba087a3385a50.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 not switching to MeeGo graphicssystem.
Fixed rounding of coordinates pre-transformation in CG paintengine.
Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index c904c3c..69a6922 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -170,7 +170,7 @@ bool QMeeGoGraphicsSystemSwitchHandler::eventFilter(QObject *object, QEvent *eve if (visibleWidgets() == 0) QMeeGoGraphicsSystem::switchToRaster(); } else { - if (visibleWidgets() == 1) + if (visibleWidgets() > 0) QMeeGoGraphicsSystem::switchToMeeGo(); } } |