diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 11:01:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 11:01:42 (GMT) |
| commit | ab794fe3a0d2992d770c09527c479a563f21164e (patch) | |
| tree | cc576561b9109121c55a5e79af22cc8b66bc30a5 /src | |
| parent | e5ef6f580e1b601898a2fea095ed5be9823bab25 (diff) | |
| parent | 4d0571667463997f5f1145408a2ba73ba293637a (diff) | |
| download | Qt-ab794fe3a0d2992d770c09527c479a563f21164e.zip Qt-ab794fe3a0d2992d770c09527c479a563f21164e.tar.gz Qt-ab794fe3a0d2992d770c09527c479a563f21164e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix Windows compilation.
Fixed race condition in raster paint engine.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 975ebb0..d1c4cab 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include <QtCore/qglobal.h> +#include <QtCore/qmutex.h> #define QT_FT_BEGIN_HEADER #define QT_FT_END_HEADER @@ -4811,6 +4812,7 @@ public: for (int i = 0; i < stops.size() && i <= 2; i++) hash_val += stops[i].second.rgba(); + QMutexLocker lock(&mutex); QGradientColorTableHash::const_iterator it = cache.constFind(hash_val); if (it == cache.constEnd()) @@ -4844,6 +4846,7 @@ protected: } QGradientColorTableHash cache; + QMutex mutex; }; void QGradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, int opacity) const |