Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

dist/changes-5.0.2

@@ -0,0 +1,48 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+source compatibility with Qt 5.0.0 and 5.0.1.
+
+However, to fix a bug we detected after the 5.0 release, this release
+has a limited binary compatibility break. We therefore recommend all
+users to recompile their applications that provided QtMultimedia
+plugins or dealt with them directly. This is an exceptional case:
+compatibility will be kept for further releases.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+ - WMF: Enabled HW-accelerated video decoding for the QML video item.
+ - WMF: Fixed unresolved topologies when using the custom MediaSink.
+ - Disable FFT when building in static mode.
+ - [QTBUG-28741] Added seek() function to QML Video item.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for BlackBerry
+-----------------
+
+ - Fixed playback of streamed audio.
+

examples/multimedia/spectrum/spectrum.pri

@@ -23,6 +23,8 @@ DEFINES += LOG_ENGINE
 # If this macro is defined, the FFTReal DLL will not be built
 #DEFINES += DISABLE_FFT
 
+static: DEFINES += DISABLE_FFT
+
 # Disables rendering of the waveform
 #DEFINES += DISABLE_WAVEFORM