diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-11 22:00:09 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-11 22:00:09 (GMT) |
| commit | 0e4083ba5bf1bbc581d072b016fb977fb1f846c1 (patch) | |
| tree | 8748e34bda5bf393067ad9ee96999f9b7f7e0181 /src/gui/painting | |
| parent | fd570dca1319cd92daf0f73b10ea4e090ea15c23 (diff) | |
| parent | 2b527006a3e9147a447a08d78004e20a7ac3d17c (diff) | |
| download | Qt-0e4083ba5bf1bbc581d072b016fb977fb1f846c1.zip Qt-0e4083ba5bf1bbc581d072b016fb977fb1f846c1.tar.gz Qt-0e4083ba5bf1bbc581d072b016fb977fb1f846c1.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
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() |