diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 00:54:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 00:54:25 (GMT) |
| commit | fdab6c1a9e6425da2685172747c5ddfd0eab0b80 (patch) | |
| tree | ba52b6be0d1927ee694bb78daa13cdeb001c9927 /src | |
| parent | c80df14aa4e7e31f4b9d19c23ed9e7793486d70e (diff) | |
| parent | f93db15d46ddcb88189a5ba010b27aeac783ed24 (diff) | |
| download | Qt-fdab6c1a9e6425da2685172747c5ddfd0eab0b80.zip Qt-fdab6c1a9e6425da2685172747c5ddfd0eab0b80.tar.gz Qt-fdab6c1a9e6425da2685172747c5ddfd0eab0b80.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
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 1690e67..4b3e14d 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 @@ -4963,6 +4964,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()) @@ -4996,6 +4998,7 @@ protected: } QGradientColorTableHash cache; + QMutex mutex; }; void QGradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, int opacity) const |