diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 15:26:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 15:26:11 (GMT) |
| commit | 7a028adec5ee09d72d2ca69a666a096cdfef972b (patch) | |
| tree | e81fed881ae0df035102f0682128d51f5ec4e72e /src | |
| parent | 977a7e097f4a2effb43704b9e069576d958842ea (diff) | |
| parent | 4c612a53a0fb137ac3eacbea96284eca9f5f018e (diff) | |
| download | Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.zip Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.tar.gz Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't use QAtomicInt in statics because they are non-POD.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/egl/qegl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index c16aeb1..776cdba 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -69,12 +69,12 @@ public: static bool displayOpened() { return displayOpen; } private: - static QAtomicInt contexts; - static QAtomicInt displayOpen; + static QBasicAtomicInt contexts; + static QBasicAtomicInt displayOpen; }; -QAtomicInt QEglContextTracker::contexts = 0; -QAtomicInt QEglContextTracker::displayOpen = 0; +QBasicAtomicInt QEglContextTracker::contexts = Q_BASIC_ATOMIC_INITIALIZER(0); +QBasicAtomicInt QEglContextTracker::displayOpen = Q_BASIC_ATOMIC_INITIALIZER(0); // Current GL and VG contexts. These are used to determine if // we can avoid an eglMakeCurrent() after a call to lazyDoneCurrent(). |