[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.1-1-19-g5e8a8a0

Timo Jyrinki timo at moszumanska.debian.org
Thu Oct 22 17:02:08 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=5e8a8a0

The following commit has been merged in the ubuntu branch:
commit 5e8a8a096773d289b8a14809aadf33512fc0315f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Oct 22 15:30:44 2015 +0000

    Revert "Modify the audio role patch to use version 5.5"
    
    This reverts commit 8b95cbe6b78041047ac0a993b8986e6e836c719c.
---
 .../Add-audio-role-API-to-QMediaPlayer.patch       | 34 +++++++++++-----------
 1 file 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 780ca42..6c2cdc4 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.5
++import QtMultimedia 5.6
  
  /*!
      \qmltype Video
@@ -71,7 +71,7 @@ index fda8768..9d28cab 100644
 +        \li MediaPlayer.GameRole - game audio.
 +        \endlist
 +
-+        \since 5.5
++        \since 5.6
 +    */
 +    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.5
++        \since 5.6
 +        \sa audioRole
 +    */
 +    function supportedAudioRoles() {
@@ -111,7 +111,7 @@ index d01c988..11d423f 100644
  //
  // This file was auto-generated by:
 -// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
-+// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
++// 'qmlplugindump -nonrelocatable QtMultimedia 5.6'
  
  Module {
 +    dependencies: ["QtQuick 2.0"]
@@ -210,7 +210,7 @@ index 60af623..5ef9ead 100644
 +    \li GameRole - game audio.
 +    \endlist
 +
-+    \since 5.5
++    \since 5.6
 +*/
 +QDeclarativeAudio::AudioRole QDeclarativeAudio::audioRole() const
 +{
@@ -237,7 +237,7 @@ index 60af623..5ef9ead 100644
 +
 +    If setting the audio role is not supported, an empty list is returned.
 +
-+    \since 5.5
++    \since 5.6
 +    \sa audioRole
 +*/
 +QJSValue QDeclarativeAudio::supportedAudioRoles() const
@@ -306,7 +306,7 @@ index 60af623..5ef9ead 100644
 +    \li GameRole - game audio.
 +    \endlist
 +
-+    \since 5.5
++    \since 5.6
 +*/
 +
 +/*!
@@ -316,7 +316,7 @@ index 60af623..5ef9ead 100644
 +
 +    If setting the audio role is not supported, an empty list is returned.
 +
-+    \since 5.5
++    \since 5.6
 +    \sa audioRole
 +*/
 +
@@ -438,7 +438,7 @@ index 8b452a1..72c24ad 100644
 +    
alue SonificationRole         Sonification, such as with user interface sounds
 +    
alue GameRole                 Game audio
 +
-+    \since 5.5
++    \since 5.6
 +    \sa QMediaPlayer::setAudioRole()
 +*/
 +
@@ -599,7 +599,7 @@ index 0000000..62696f0
 +    
-- 
qtmultimedia packaging



More information about the pkg-kde-commits mailing list