diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-30 13:49:41 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-30 13:49:41 (GMT) |
| commit | 5cd971bb508e1288573d32a996183f3e9359c90e (patch) | |
| tree | 2617b30b5cfeeedf3b63a7c3251779766fc1276f /src/gui | |
| parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
| parent | ab794fe3a0d2992d770c09527c479a563f21164e (diff) | |
| download | Qt-5cd971bb508e1288573d32a996183f3e9359c90e.zip Qt-5cd971bb508e1288573d32a996183f3e9359c90e.tar.gz Qt-5cd971bb508e1288573d32a996183f3e9359c90e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
tests/auto/qpainter/tst_qpainter.cpp
Diffstat (limited to 'src/gui')
| -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 8f9d8ba..3717ed9 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 @@ -4946,6 +4947,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()) @@ -4979,6 +4981,7 @@ protected: } QGradientColorTableHash cache; + QMutex mutex; }; void QGradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, int opacity) const |