diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 23:30:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 23:30:47 (GMT) |
| commit | 86f167ceaf92b386595d62a43bb5d00b4019c989 (patch) | |
| tree | 1353330a67306f2fdae49468dfdf07c5912baaca /src/gui/painting | |
| parent | 581df4debb1660ad1879fd59baf79f7fbde260ed (diff) | |
| parent | ff98c93a33170b8fdc28b553490819b51cb80d86 (diff) | |
| download | Qt-86f167ceaf92b386595d62a43bb5d00b4019c989.zip Qt-86f167ceaf92b386595d62a43bb5d00b4019c989.tar.gz Qt-86f167ceaf92b386595d62a43bb5d00b4019c989.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix crash in QRuntimeGraphicsSystem due to destruction order.
Fix crash in OpenVG when failing to allocate large VGImages.
Updated 4.7.0 changelog
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 2828e9d..a9fbbee 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -94,7 +94,8 @@ QRuntimePixmapData::QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelTy QRuntimePixmapData::~QRuntimePixmapData() { - m_graphicsSystem->removePixmapData(this); + if (QApplicationPrivate::graphics_system) + m_graphicsSystem->removePixmapData(this); delete m_data; } @@ -258,7 +259,8 @@ QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, Q QRuntimeWindowSurface::~QRuntimeWindowSurface() { - m_graphicsSystem->removeWindowSurface(this); + if (QApplicationPrivate::graphics_system) + m_graphicsSystem->removeWindowSurface(this); } QPaintDevice *QRuntimeWindowSurface::paintDevice() |