From 34721c4d3690335d2d9fe79620e566fda78de25b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 25 Jul 2012 10:16:59 +0200
Subject: Make codecForLocale atomic

Change-Id: I8017b1c2aa1df8d613e83919a945fd5f320713d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qcoreglobaldata_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/kernel/qcoreglobaldata_p.h')

diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h
index 1ff7d17019..5cbf74b532 100644
--- a/src/corelib/kernel/qcoreglobaldata_p.h
+++ b/src/corelib/kernel/qcoreglobaldata_p.h
@@ -73,7 +73,7 @@ struct QCoreGlobalData {
     QReadWriteLock dirSearchPathsLock;
 
     QList<QTextCodec*> allCodecs;
-    QTextCodec *codecForLocale;
+    QAtomicPointer<QTextCodec> codecForLocale;
     QTextCodecCache codecCache;
 
     static QCoreGlobalData *instance();
-- 
cgit v1.2.3