diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 02:49:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 02:49:51 (GMT) |
| commit | 0a36afede483a05d664036a2d4366ca305215266 (patch) | |
| tree | be97efdeb867c4509955c9d638bf0b07fafae7ea | |
| parent | 57e9bffdde1d1ac800720082961c2f12489728a7 (diff) | |
| parent | 603df0ef7d92c8492af5957f3f6cc9d9fbc48888 (diff) | |
| download | Qt-0a36afede483a05d664036a2d4366ca305215266.zip Qt-0a36afede483a05d664036a2d4366ca305215266.tar.gz Qt-0a36afede483a05d664036a2d4366ca305215266.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:
My 4.6.3 changes
Don't use QAtomicInt in statics because they are non-POD.
| -rw-r--r-- | dist/changes-4.6.3 | 6 | ||||
| -rw-r--r-- | src/gui/egl/qegl.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3 index 6a81f6a..c1ace7b 100644 --- a/dist/changes-4.6.3 +++ b/dist/changes-4.6.3 @@ -233,6 +233,12 @@ Third party components - Updated bar to the latest version from baz.org. +Demos +----- + + - QtMultimedia + * Spectrum analyzer application + **************************************************************************** * Platform Specific Changes * 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(). |