summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Jyrinki <timo.jyrinki@canonical.com>2015-10-05 10:05:01 (GMT)
committerTimo Jyrinki <timo.jyrinki@canonical.com>2015-10-05 10:05:01 (GMT)
commit8b95cbe6b78041047ac0a993b8986e6e836c719c (patch)
tree8c78ff123f2b79f629d30a888a53a94a405a61cb
parent96fe09a86fd9e0dcd7618baa6c64c963c317281b (diff)
Modify the audio role patch to use version 5.5
-rw-r--r--debian/patches/Add-audio-role-API-to-QMediaPlayer.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
index 9bdb34d..8c20915 100644
--- a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
+++ b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
@@ -39,7 +39,7 @@ index fda8768..9d28cab 100644
import QtQuick 2.0
-import QtMultimedia 5.0
-+import QtMultimedia 5.6
++import QtMultimedia 5.5
/*!
\qmltype Video
@@ -71,7 +71,7 @@ index fda8768..9d28cab 100644
+ \li MediaPlayer.GameRole - game audio.
+ \endlist
+
-+ \since 5.6
++ \since 5.5
+ */
+ property alias audioRole: player.audioRole
+
@@ -90,7 +90,7 @@ index fda8768..9d28cab 100644
+
+ If setting the audio role is not supported, an empty list is returned.
+
-+ \since 5.6
++ \since 5.5
+ \sa audioRole
+ */
+ function supportedAudioRoles() {
@@ -113,7 +113,7 @@ index d01c988..11d423f 100644
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
-+// 'qmlplugindump -nonrelocatable QtMultimedia 5.6'
++// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
Module {
+ dependencies: ["QtQuick 2.0"]
@@ -212,7 +212,7 @@ index 60af623..5ef9ead 100644
+ \li GameRole - game audio.
+ \endlist
+
-+ \since 5.6
++ \since 5.5
+*/
+QDeclarativeAudio::AudioRole QDeclarativeAudio::audioRole() const
+{
@@ -239,7 +239,7 @@ index 60af623..5ef9ead 100644
+
+ If setting the audio role is not supported, an empty list is returned.
+
-+ \since 5.6
++ \since 5.5
+ \sa audioRole
+*/
+QJSValue QDeclarativeAudio::supportedAudioRoles() const
@@ -308,7 +308,7 @@ index 60af623..5ef9ead 100644
+ \li GameRole - game audio.
+ \endlist
+
-+ \since 5.6
++ \since 5.5
+*/
+
+/*!
@@ -318,7 +318,7 @@ index 60af623..5ef9ead 100644
+
+ If setting the audio role is not supported, an empty list is returned.
+
-+ \since 5.6
++ \since 5.5
+ \sa audioRole
+*/
+
@@ -440,7 +440,7 @@ index 8b452a1..72c24ad 100644
+ \value SonificationRole Sonification, such as with user interface sounds
+ \value GameRole Game audio
+
-+ \since 5.6
++ \since 5.5
+ \sa QMediaPlayer::setAudioRole()
+*/
+
@@ -601,7 +601,7 @@ index 0000000..62696f0
+ \class QAudioRoleControl
+ \inmodule QtMultimedia
+ \ingroup multimedia_control
-+ \since 5.6
++ \since 5.5
+
+ \brief The QAudioRoleControl class provides control over the audio role of a media object.
+
@@ -610,7 +610,7 @@ index 0000000..62696f0
+ The functionality provided by this control is exposed to application code through the
+ QMediaPlayer class.
+
-+ The interface name of QAudioRoleControl is \c org.qt-project.qt.audiorolecontrol/5.6 as
++ The interface name of QAudioRoleControl is \c org.qt-project.qt.audiorolecontrol/5.5 as
+ defined in QAudioRoleControl_iid.
+
+ \sa QMediaService::requestControl(), QMediaPlayer
@@ -619,7 +619,7 @@ index 0000000..62696f0
+/*!
+ \macro QAudioRoleControl_iid
+
-+ \c org.qt-project.qt.audiorolecontrol/5.6
++ \c org.qt-project.qt.audiorolecontrol/5.5
+
+ Defines the interface name of the QAudioRoleControl class.
+
@@ -739,7 +739,7 @@ index 0000000..983b2ae
+ explicit QAudioRoleControl(QObject *parent = 0);
+};
+
-+#define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6"
++#define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.5"
+Q_MEDIA_DECLARE_CONTROL(QAudioRoleControl, QAudioRoleControl_iid)
+
+QT_END_NAMESPACE
@@ -834,7 +834,7 @@ index 5b271bc..396508a 100644
+
+ If setting the audio role is not supported, an empty list is returned.
+
-+ \since 5.6
++ \since 5.5
+ \sa audioRole
+*/
+QList<QAudio::Role> QMediaPlayer::supportedAudioRoles() const
@@ -858,7 +858,7 @@ index 5b271bc..396508a 100644
+
+ Signals that the audio \a role of the media player has changed.
+
-+ \since 5.6
++ \since 5.5
+*/
+
// Properties
@@ -876,7 +876,7 @@ index 5b271bc..396508a 100644
+
+ The audio role must be set before calling setMedia().
+
-+ \since 5.6
++ \since 5.5
+ \sa supportedAudioRoles()
+*/
+
@@ -991,7 +991,7 @@ index a257ee7..355e253 100644
+
+ QQmlEngine engine;
+ QQmlComponent component(&engine);
-+ component.setData("import QtQuick 2.0 \n import QtMultimedia 5.6 \n Audio { }", QUrl());
++ component.setData("import QtQuick 2.0 \n import QtMultimedia 5.5 \n Audio { }", QUrl());
+
+ {
+ mockService.setHasAudioRole(false);