diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 15:35:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 15:35:53 (GMT) |
| commit | 97f7299854197c6093aaefc1ec174209d68892e7 (patch) | |
| tree | 26777ca5bcfb8c15ee022b28c5b940251b246cc9 /src/gui | |
| parent | ee6aa8394ec7a93599571336af31b6a06e6e3ffd (diff) | |
| parent | 2efd51c2808874c9217cdaea905754ae72d4e443 (diff) | |
| download | Qt-97f7299854197c6093aaefc1ec174209d68892e7.zip Qt-97f7299854197c6093aaefc1ec174209d68892e7.tar.gz Qt-97f7299854197c6093aaefc1ec174209d68892e7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Destroy the old runtime system only when existing pixmaps were migrated.
Fixed autotest failure in tst_qgl::clipTest.
Added way to destroy the share widget in the GL graphics system.
qdoc: All references to -assistant and -base were removed.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index e1e0ad0..2828e9d 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -366,7 +366,7 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) #ifdef QT_DEBUG qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )"; #endif - delete m_graphicsSystem; + QGraphicsSystem *oldSystem = m_graphicsSystem; m_graphicsSystem = QGraphicsSystemFactory::create(name); m_graphicsSystemName = name; @@ -393,6 +393,8 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } + + delete oldSystem; } void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) const |