From 4c612a53a0fb137ac3eacbea96284eca9f5f018e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 25 May 2010 10:24:41 +0200
Subject: Don't use QAtomicInt in statics because they are non-POD.

Reviewed-By: Olivier Goffart
---
 src/gui/egl/qegl.cpp | 8 ++++----
 1 file 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().
-- 
cgit v0.12


From 3955a8d51f951b3c8cc7a6ceb565370391f83294 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 25 May 2010 16:58:10 +0100
Subject: My 4.6.3 changes

---
 dist/changes-4.6.3 | 6 ++++++
 1 file changed, 6 insertions(+)

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                           *
-- 
cgit v0.12