summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qgraphicssystem_runtime.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-02 18:08:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-02 18:08:58 (GMT)
commit0eee17b5d789c2314f582e363e377809ef6dea7c (patch)
treec65dcd250ac022ac77615780ad1a7ebbbeef70ac /src/gui/painting/qgraphicssystem_runtime.cpp
parente720c269b5f98da6c2b430df84cd86c3aede3d81 (diff)
parent6a405778ca053d05d32ea8e0949bee917c0316e2 (diff)
downloadQt-0eee17b5d789c2314f582e363e377809ef6dea7c.zip
Qt-0eee17b5d789c2314f582e363e377809ef6dea7c.tar.gz
Qt-0eee17b5d789c2314f582e363e377809ef6dea7c.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: Crash when dragging with mingw Don't do alpha/opaque check which might cause a conversion and later pointer not-matching.
Diffstat (limited to 'src/gui/painting/qgraphicssystem_runtime.cpp')
-rw-r--r--src/gui/painting/qgraphicssystem_runtime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index 1c3ae10..3438137 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -418,7 +418,7 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name)
QRuntimePixmapData *proxy = m_pixmapDatas.at(i);
QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data);
// ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers.
- newData->fromImage(proxy->m_data->toImage(), Qt::AutoColor | Qt::OrderedAlphaDither);
+ newData->fromImage(proxy->m_data->toImage(), Qt::NoOpaqueDetection);
delete proxy->m_data;
proxy->m_data = newData;
proxy->readBackInfo();