diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-25 10:16:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:12:35 +0200 |
| commit | 34721c4d3690335d2d9fe79620e566fda78de25b (patch) | |
| tree | 1f4b00499b8bc5749b503f25a13bb103f97443bf /src/corelib/kernel/qcoreglobaldata_p.h | |
| parent | 88d2e92b39ffd4a6ea9446498ad5a1cb208022a6 (diff) | |
Make codecForLocale atomic
Change-Id: I8017b1c2aa1df8d613e83919a945fd5f320713d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qcoreglobaldata_p.h')
| -rw-r--r-- | src/corelib/kernel/qcoreglobaldata_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |