summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-11 16:35:03 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-11 17:25:39 +0200
commit5084871212db74d2738512be4f3b9c678d60ed4c (patch)
tree0b03f90e2804441249e8da545655d4a7e13d12b3
parent697abcc532805fa1d10d56256a5f387fbad8c11b (diff)
parent2d8ad6066d59075ebb20ae880af00eaba027d5e9 (diff)
Merge branch 'release' into old/5.0old/5.0
-rw-r--r--dist/changes-5.0.248
-rw-r--r--examples/multimedia/spectrum/spectrum.pri2
-rw-r--r--sync.profile8
3 files changed, 54 insertions, 4 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 00000000..53d93e69
--- /dev/null
+++ b/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.
+
diff --git a/examples/multimedia/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri
index 75c01131..38b3f150 100644
--- a/examples/multimedia/spectrum/spectrum.pri
+++ b/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
diff --git a/sync.profile b/sync.profile
index f33c9a8c..f9c65d9c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -20,8 +20,8 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/stable",
- "qtxmlpatterns" => "refs/heads/stable",
- "qtdeclarative" => "refs/heads/stable",
- "qtjsbackend" => "refs/heads/stable",
+ "qtbase" => "refs/heads/old/5.0",
+ "qtxmlpatterns" => "refs/heads/old/5.0",
+ "qtdeclarative" => "refs/heads/old/5.0",
+ "qtjsbackend" => "refs/heads/old/5.0",
);