diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-31 10:36:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 11:29:08 +0100 |
| commit | e277575987657aa07444eea9bee99769f039d3b0 (patch) | |
| tree | 549c419596e340c8ad123df44fc75662ed47b2a7 /src/gui/text | |
| parent | 5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff) | |
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qstatictext_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 37bbd4ffee..7c95af31a8 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -259,7 +259,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id, newFreetype->hbFace = qHBNewFace(face, hb_getSFntTable); Q_CHECK_PTR(newFreetype->hbFace); - newFreetype->ref = 1; + newFreetype->ref.store(1); newFreetype->xsize = 0; newFreetype->ysize = 0; newFreetype->matrix.xx = 0x10000; diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h index c84e85396d..5f9410c31d 100644 --- a/src/gui/text/qstatictext_p.h +++ b/src/gui/text/qstatictext_p.h @@ -68,7 +68,7 @@ public: OpenGLUserData }; - QStaticTextUserData(Type t) : type(t) { ref = 0; } + QStaticTextUserData(Type t) : ref(0), type(t) {} virtual ~QStaticTextUserData() {} QAtomicInt ref; |