diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 09:54:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 09:54:47 (GMT) |
| commit | b8ded0df9c85558b93ee5ec5abd5774c87c4deed (patch) | |
| tree | a4ec04241eab9eec4252145f73bf56904a01a5d0 /src/gui | |
| parent | 5c7d297cd2323c3bc824cd05344b1d57512a65c2 (diff) | |
| parent | 60bec281fe0a82556c07db3f8e13587d47b8449e (diff) | |
| download | Qt-b8ded0df9c85558b93ee5ec5abd5774c87c4deed.zip Qt-b8ded0df9c85558b93ee5ec5abd5774c87c4deed.tar.gz Qt-b8ded0df9c85558b93ee5ec5abd5774c87c4deed.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:
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 5841d40..33652ee 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -394,7 +394,10 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) if(m_windowSurfaceDestroyPolicy == DestroyAfterFirstFlush) proxy->m_pendingWindowSurface.reset(proxy->m_windowSurface.take()); - proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); + QWindowSurface *newWindowSurface = m_graphicsSystem->createWindowSurface(widget); + newWindowSurface->setGeometry(proxy->geometry()); + + proxy->m_windowSurface.reset(newWindowSurface); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } |