[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.0-3-8-g96fe09a
Timo Jyrinki
timo at moszumanska.debian.org
Mon Oct 5 08:27:08 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=96fe09a
The following commit has been merged in the ubuntu branch:
commit 96fe09a86fd9e0dcd7618baa6c64c963c317281b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Oct 5 08:26:52 2015 +0000
Add the patch files that were missing.
---
.../Add-audio-role-API-to-QMediaPlayer.patch | 1257 ++++++++++++++++++++
debian/patches/Added-new-playlist-QML-type.patch | 1119 +++++++++++++++++
2 files changed, 2376 insertions(+)
diff --git a/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
new file mode 100644
index 0000000..9bdb34d
--- /dev/null
+++ b/debian/patches/Add-audio-role-API-to-QMediaPlayer.patch
@@ -0,0 +1,1257 @@
+From 23acd9f01d5dcca84025eb95de266e7e6b6cb386 Mon Sep 17 00:00:00 2001
+From: Jim Hodapp <jim.hodapp at canonical.com>
+Date: Mon, 3 Aug 2015 14:27:16 +0200
+Subject: [PATCH] Add audio role API to QMediaPlayer.
+
+Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d
+Task-number: QTBUG-41054
+Reviewed-by: Yoann Lopes <yoann.lopes at theqtcompany.com>
+---
+ src/imports/multimedia/Video.qml | 45 +++++++-
+ src/imports/multimedia/plugins.qmltypes | 23 +++-
+ src/imports/multimedia/qdeclarativeaudio.cpp | 117 +++++++++++++++++++++
+ src/imports/multimedia/qdeclarativeaudio_p.h | 24 +++++
+ src/multimedia/audio/qaudio.cpp | 60 +++++++++++
+ src/multimedia/audio/qaudio.h | 15 +++
+ src/multimedia/controls/controls.pri | 6 +-
+ src/multimedia/controls/qaudiorolecontrol.cpp | 111 +++++++++++++++++++
+ src/multimedia/controls/qaudiorolecontrol.h | 69 ++++++++++++
+ src/multimedia/controls/qmediaplayercontrol.cpp | 1 +
+ src/multimedia/playback/qmediaplayer.cpp | 67 ++++++++++++
+ src/multimedia/playback/qmediaplayer.h | 8 ++
+ .../unit/qdeclarativeaudio/qdeclarativeaudio.pro | 4 +
+ .../qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 49 +++++++++
+ tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp | 41 ++++++++
+ .../unit/qmultimedia_common/mockaudiorolecontrol.h | 72 +++++++++++++
+ .../qmultimedia_common/mockmediaplayerservice.h | 13 +++
+ tests/auto/unit/qmultimedia_common/mockplayer.pri | 3 +-
+ 18 files changed, 722 insertions(+), 6 deletions(-)
+ create mode 100644 src/multimedia/controls/qaudiorolecontrol.cpp
+ create mode 100644 src/multimedia/controls/qaudiorolecontrol.h
+ create mode 100644 tests/auto/unit/qmultimedia_common/mockaudiorolecontrol.h
+
+diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
+index fda8768..9d28cab 100644
+--- a/src/imports/multimedia/Video.qml
++++ b/src/imports/multimedia/Video.qml
+@@ -32,7 +32,7 @@
+ ****************************************************************************/
+
+ import QtQuick 2.0
+-import QtMultimedia 5.0
++import QtMultimedia 5.6
+
+ /*!
+ \qmltype Video
+@@ -269,6 +269,35 @@ Item {
+ property alias position: player.position
+
+ /*!
++ \qmlproperty enumeration Video::audioRole
++
++ This property holds the role of the audio stream. It can be set to specify the type of audio
++ being played, allowing the system to make appropriate decisions when it comes to volume,
++ routing or post-processing.
++
++ The audio role must be set before setting the source property.
++
++ Supported values can be retrieved with supportedAudioRoles().
++
++ The value can be one of:
++ \list
++ \li MediaPlayer.UnknownRole - the role is unknown or undefined.
++ \li MediaPlayer.MusicRole - music.
++ \li MediaPlayer.VideoRole - soundtrack from a movie or a video.
++ \li MediaPlayer.VoiceCommunicationRole - voice communications, such as telephony.
++ \li MediaPlayer.AlarmRole - alarm.
++ \li MediaPlayer.NotificationRole - notification, such as an incoming e-mail or a chat request.
++ \li MediaPlayer.RingtoneRole - ringtone.
++ \li MediaPlayer.AccessibilityRole - for accessibility, such as with a screen reader.
++ \li MediaPlayer.SonificationRole - sonification, such as with user interface sounds.
++ \li MediaPlayer.GameRole - game audio.
++ \endlist
++
++ \since 5.6
++ */
++ property alias audioRole: player.audioRole
++
++ /*!
+ \qmlproperty bool Video::seekable
+
+ This property holds whether the playback position of the video can be
+@@ -413,6 +442,20 @@ Item {
+ player.seek(offset);
+ }
+
++ /*!
++ \qmlmethod list<int> Video::supportedAudioRoles()
++
++ Returns a list of supported audio roles.
++
++ If setting the audio role is not supported, an empty list is returned.
++
++ \since 5.6
++ \sa audioRole
++ */
++ function supportedAudioRoles() {
++ return player.supportedAudioRoles();
++ }
++
+ }
+
+ // ***************************************
+diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
+index d01c988..11d423f 100644
+--- a/src/imports/multimedia/plugins.qmltypes
++++ b/src/imports/multimedia/plugins.qmltypes
+@@ -1,12 +1,13 @@
+-import QtQuick.tooling 1.1
++import QtQuick.tooling 1.2
+
+ // This file describes the plugin-supplied types contained in the library.
+ // It is used for QML tooling purposes only.
+ //
+ // This file was auto-generated by:
+-// 'qmlplugindump -nonrelocatable QtMultimedia 5.5'
++// 'qmlplugindump -nonrelocatable QtMultimedia 5.6'
+
+ Module {
++ dependencies: ["QtQuick 2.0"]
+ Component {
+ name: "QAbstractVideoFilter"
+ prototype: "QObject"
+@@ -195,6 +196,21 @@ Module {
+ "ResourceMissing": 3
+ }
+ }
++ Enum {
++ name: "AudioRole"
++ values: {
++ "UnknownRole": 0,
++ "AccessibilityRole": 7,
++ "AlarmRole": 4,
++ "GameRole": 9,
++ "MusicRole": 1,
++ "NotificationRole": 5,
++ "RingtoneRole": 6,
++ "SonificationRole": 8,
++ "VideoRole": 2,
++ "VoiceCommunicationRole": 3
++ }
++ }
+ Property { name: "source"; type: "QUrl" }
+ Property { name: "loops"; type: "int" }
+ Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
+@@ -220,10 +236,12 @@ Module {
+ }
+ Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true }
+ Property { name: "availability"; type: "Availability"; isReadonly: true }
++ Property { name: "audioRole"; revision: 1; type: "AudioRole" }
+ Signal { name: "loopCountChanged" }
+ Signal { name: "paused" }
+ Signal { name: "stopped" }
+ Signal { name: "playing" }
++ Signal { name: "audioRoleChanged"; revision: 1 }
+ Signal {
+ name: "availabilityChanged"
+ Parameter { name: "availability"; type: "Availability" }
+@@ -240,6 +258,7 @@ Module {
+ name: "seek"
+ Parameter { name: "position"; type: "int" }
+ }
++ Method { name: "supportedAudioRoles"; revision: 1; type: "QJSValue" }
+ }
+ Component {
+ name: "QDeclarativeCamera"
+diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
+index 60af623..5ef9ead 100644
+--- a/src/imports/multimedia/qdeclarativeaudio.cpp
++++ b/src/imports/multimedia/qdeclarativeaudio.cpp
+@@ -46,6 +46,7 @@
+ #include "qdeclarativemediametadata_p.h"
+
+ #include <QTimerEvent>
++#include <QtQml/qqmlengine.h>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -112,6 +113,7 @@ QDeclarativeAudio::QDeclarativeAudio(QObject *parent)
+ , m_position(0)
+ , m_vol(1.0)
+ , m_playbackRate(1.0)
++ , m_audioRole(UnknownRole)
+ , m_playbackState(QMediaPlayer::StoppedState)
+ , m_status(QMediaPlayer::NoMedia)
+ , m_error(QMediaPlayer::ServiceMissingError)
+@@ -152,6 +154,78 @@ QDeclarativeAudio::Availability QDeclarativeAudio::availability() const
+ return Availability(m_player->availability());
+ }
+
++/*!
++ \qmlproperty enumeration QtMultimedia::Audio::audioRole
++
++ This property holds the role of the audio stream. It can be set to specify the type of audio
++ being played, allowing the system to make appropriate decisions when it comes to volume,
++ routing or post-processing.
++
++ The audio role must be set before setting the source property.
++
++ Supported values can be retrieved with supportedAudioRoles().
++
++ The value can be one of:
++ \list
++ \li UnknownRole - the role is unknown or undefined.
++ \li MusicRole - music.
++ \li VideoRole - soundtrack from a movie or a video.
++ \li VoiceCommunicationRole - voice communications, such as telephony.
++ \li AlarmRole - alarm.
++ \li NotificationRole - notification, such as an incoming e-mail or a chat request.
++ \li RingtoneRole - ringtone.
++ \li AccessibilityRole - for accessibility, such as with a screen reader.
++ \li SonificationRole - sonification, such as with user interface sounds.
++ \li GameRole - game audio.
++ \endlist
++
++ \since 5.6
++*/
++QDeclarativeAudio::AudioRole QDeclarativeAudio::audioRole() const
++{
++ return !m_complete ? m_audioRole : AudioRole(m_player->audioRole());
++}
++
++void QDeclarativeAudio::setAudioRole(QDeclarativeAudio::AudioRole audioRole)
++{
++ if (this->audioRole() == audioRole)
++ return;
++
++ if (m_complete) {
++ m_player->setAudioRole(QAudio::Role(audioRole));
++ } else {
++ m_audioRole = audioRole;
++ emit audioRoleChanged();
++ }
++}
++
++/*!
++ \qmlmethod list<int> QtMultimedia::Audio::supportedAudioRoles()
++
++ Returns a list of supported audio roles.
++
++ If setting the audio role is not supported, an empty list is returned.
++
++ \since 5.6
++ \sa audioRole
++*/
++QJSValue QDeclarativeAudio::supportedAudioRoles() const
++{
++ QJSEngine *engine = qmlEngine(this);
++
++ if (!m_complete)
++ return engine->newArray();
++
++ QList<QAudio::Role> roles = m_player->supportedAudioRoles();
++ int size = roles.size();
++
++ QJSValue result = engine->newArray(size);
++ for (int i = 0; i < size; ++i)
++ result.setProperty(i, roles.at(i));
++
++ return result;
++}
++
+ QUrl QDeclarativeAudio::source() const
+ {
+ return m_source;
+@@ -734,6 +808,8 @@ void QDeclarativeAudio::classBegin()
+ this, SIGNAL(hasAudioChanged()));
+ connect(m_player, SIGNAL(videoAvailableChanged(bool)),
+ this, SIGNAL(hasVideoChanged()));
++ connect(m_player, SIGNAL(audioRoleChanged(QAudio::Role)),
++ this, SIGNAL(audioRoleChanged()));
+
+ m_error = m_player->availability() == QMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError;
+
+@@ -756,6 +832,8 @@ void QDeclarativeAudio::componentComplete()
+ m_player->setMuted(m_muted);
+ if (!qFuzzyCompare(m_playbackRate, qreal(1.0)))
+ m_player->setPlaybackRate(m_playbackRate);
++ if (m_audioRole != UnknownRole)
++ m_player->setAudioRole(QAudio::Role(m_audioRole));
+
+ if (!m_content.isNull() && (m_autoLoad || m_autoPlay)) {
+ m_player->setMedia(m_content, 0);
+@@ -1290,6 +1368,45 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
+ */
+
+ /*!
++ \qmlproperty enumeration QtMultimedia::MediaPlayer::audioRole
++
++ This property holds the role of the audio stream. It can be set to specify the type of audio
++ being played, allowing the system to make appropriate decisions when it comes to volume,
++ routing or post-processing.
++
++ The audio role must be set before setting the source property.
++
++ Supported values can be retrieved with supportedAudioRoles().
++
++ The value can be one of:
++ \list
++ \li UnknownRole - the role is unknown or undefined.
++ \li MusicRole - music.
++ \li VideoRole - soundtrack from a movie or a video.
++ \li VoiceCommunicationRole - voice communications, such as telephony.
++ \li AlarmRole - alarm.
++ \li NotificationRole - notification, such as an incoming e-mail or a chat request.
++ \li RingtoneRole - ringtone.
++ \li AccessibilityRole - for accessibility, such as with a screen reader.
++ \li SonificationRole - sonification, such as with user interface sounds.
++ \li GameRole - game audio.
++ \endlist
++
++ \since 5.6
++*/
++
++/*!
++ \qmlmethod list<int> QtMultimedia::MediaPlayer::supportedAudioRoles()
++
++ Returns a list of supported audio roles.
++
++ If setting the audio role is not supported, an empty list is returned.
++
++ \since 5.6
++ \sa audioRole
++*/
++
++/*!
+ \qmlmethod QtMultimedia::MediaPlayer::play()
+
+ Starts playback of the media.
+diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
+index eef7054..d836396 100644
+--- a/src/imports/multimedia/qdeclarativeaudio_p.h
++++ b/src/imports/multimedia/qdeclarativeaudio_p.h
+@@ -48,6 +48,7 @@
+ #include <QtCore/qbasictimer.h>
+ #include <QtQml/qqmlparserstatus.h>
+ #include <QtQml/qqml.h>
++#include <QtQml/qjsvalue.h>
+
+ #include <qmediaplayer.h>
+
+@@ -87,11 +88,13 @@ class QDeclarativeAudio : public QObject, public QQmlParserStatus
+ Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT)
+ Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false)
+ Q_PROPERTY(Availability availability READ availability NOTIFY availabilityChanged)
++ Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged REVISION 1)
+ Q_ENUMS(Status)
+ Q_ENUMS(Error)
+ Q_ENUMS(Loop)
+ Q_ENUMS(PlaybackState)
+ Q_ENUMS(Availability)
++ Q_ENUMS(AudioRole)
+ Q_INTERFACES(QQmlParserStatus)
+ public:
+ enum Status
+@@ -136,6 +139,19 @@ public:
+ ResourceMissing = QMultimedia::ResourceError
+ };
+
++ enum AudioRole {
++ UnknownRole = QAudio::UnknownRole,
++ AccessibilityRole = QAudio::AccessibilityRole,
++ AlarmRole = QAudio::AlarmRole,
++ GameRole = QAudio::GameRole,
++ MusicRole = QAudio::MusicRole,
++ NotificationRole = QAudio::NotificationRole,
++ RingtoneRole = QAudio::RingtoneRole,
++ SonificationRole = QAudio::SonificationRole,
++ VideoRole = QAudio::VideoRole,
++ VoiceCommunicationRole = QAudio::VoiceCommunicationRole
++ };
++
+ QDeclarativeAudio(QObject *parent = 0);
+ ~QDeclarativeAudio();
+
+@@ -154,6 +170,9 @@ public:
+
+ Availability availability() const;
+
++ AudioRole audioRole() const;
++ void setAudioRole(AudioRole audioRole);
++
+ QUrl source() const;
+ void setSource(const QUrl &url);
+
+@@ -196,6 +215,8 @@ public Q_SLOTS:
+ void stop();
+ void seek(int position);
+
++ Q_REVISION(1) QJSValue supportedAudioRoles() const;
++
+ Q_SIGNALS:
+ Q_REVISION(1) void playlistChanged();
+
+@@ -225,6 +246,8 @@ Q_SIGNALS:
+ void seekableChanged();
+ void playbackRateChanged();
+
++ Q_REVISION(1) void audioRoleChanged();
++
+ void availabilityChanged(Availability availability);
+
+ void errorChanged();
+@@ -253,6 +276,7 @@ private:
+ int m_position;
+ qreal m_vol;
+ qreal m_playbackRate;
++ AudioRole m_audioRole;
+
+ QMediaPlayer::State m_playbackState;
+ QMediaPlayer::MediaStatus m_status;
+diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
+index 8b452a1..72c24ad 100644
+--- a/src/multimedia/audio/qaudio.cpp
++++ b/src/multimedia/audio/qaudio.cpp
+@@ -42,6 +42,7 @@ static void qRegisterAudioMetaTypes()
+ qRegisterMetaType<QAudio::Error>();
+ qRegisterMetaType<QAudio::State>();
+ qRegisterMetaType<QAudio::Mode>();
++ qRegisterMetaType<QAudio::Role>();
+ }
+
+ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
+@@ -83,6 +84,26 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
+
alue AudioInput audio input device
+ */
+
++/*!
++ \enum QAudio::Role
++
++ This enum describes the role of an audio stream.
++
++
alue UnknownRole The role is unknown or undefined
++
alue MusicRole Music
++
alue VideoRole Soundtrack from a movie or a video
++
alue VoiceCommunicationRole Voice communications, such as telephony
++
alue AlarmRole Alarm
++
alue NotificationRole Notification, such as an incoming e-mail or a chat request
++
alue RingtoneRole Ringtone
++
alue AccessibilityRole For accessibility, such as with a screen reader
++
alue SonificationRole Sonification, such as with user interface sounds
++
alue GameRole Game audio
++
++ \since 5.6
++ \sa QMediaPlayer::setAudioRole()
++*/
++
+ #ifndef QT_NO_DEBUG_STREAM
+ QDebug operator<<(QDebug dbg, QAudio::Error error)
+ {
+@@ -143,6 +164,45 @@ QDebug operator<<(QDebug dbg, QAudio::Mode mode)
+ }
+ return dbg;
+ }
++
++QDebug operator<<(QDebug dbg, QAudio::Role role)
++{
++ QDebugStateSaver saver(dbg);
++ dbg.nospace();
++ switch (role) {
++ case QAudio::UnknownRole:
++ dbg << "UnknownRole";
++ break;
++ case QAudio::AccessibilityRole:
++ dbg << "AccessibilityRole";
++ break;
++ case QAudio::AlarmRole:
++ dbg << "AlarmRole";
++ break;
++ case QAudio::GameRole:
++ dbg << "GameRole";
++ break;
++ case QAudio::MusicRole:
++ dbg << "MusicRole";
++ break;
++ case QAudio::NotificationRole:
++ dbg << "NotificationRole";
++ break;
++ case QAudio::RingtoneRole:
++ dbg << "RingtoneRole";
++ break;
++ case QAudio::SonificationRole:
++ dbg << "SonificationRole";
++ break;
++ case QAudio::VideoRole:
++ dbg << "VideoRole";
++ break;
++ case QAudio::VoiceCommunicationRole:
++ dbg << "VoiceCommunicationRole";
++ break;
++ }
++ return dbg;
++}
+ #endif
+
+
+diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
+index 6395314..2ee66bc 100644
+--- a/src/multimedia/audio/qaudio.h
++++ b/src/multimedia/audio/qaudio.h
+@@ -51,12 +51,26 @@ namespace QAudio
+ enum Error { NoError, OpenError, IOError, UnderrunError, FatalError };
+ enum State { ActiveState, SuspendedState, StoppedState, IdleState };
+ enum Mode { AudioInput, AudioOutput };
++
++ enum Role {
++ UnknownRole,
++ MusicRole,
++ VideoRole,
++ VoiceCommunicationRole,
++ AlarmRole,
++ NotificationRole,
++ RingtoneRole,
++ AccessibilityRole,
++ SonificationRole,
++ GameRole
++ };
+ }
+
+ #ifndef QT_NO_DEBUG_STREAM
+ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Error error);
+ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::State state);
+ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Mode mode);
++Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Role role);
+ #endif
+
+ QT_END_NAMESPACE
+@@ -64,5 +78,6 @@ QT_END_NAMESPACE
+ Q_DECLARE_METATYPE(QAudio::Error)
+ Q_DECLARE_METATYPE(QAudio::State)
+ Q_DECLARE_METATYPE(QAudio::Mode)
++Q_DECLARE_METATYPE(QAudio::Role)
+
+ #endif // QAUDIO_H
+diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
+index b19532f..7ab2e51 100644
+--- a/src/multimedia/controls/controls.pri
++++ b/src/multimedia/controls/controls.pri
+@@ -36,7 +36,8 @@ PUBLIC_HEADERS += \
+ controls/qvideowindowcontrol.h \
+ controls/qmediaaudioprobecontrol.h \
+ controls/qmediavideoprobecontrol.h \
+- controls/qmediaavailabilitycontrol.h
++ controls/qmediaavailabilitycontrol.h \
++ controls/qaudiorolecontrol.h
+
+ PRIVATE_HEADERS += \
+ controls/qmediaplaylistcontrol_p.h \
+@@ -79,5 +80,6 @@ SOURCES += \
+ controls/qaudioencodersettingscontrol.cpp \
+ controls/qaudioinputselectorcontrol.cpp \
+ controls/qaudiooutputselectorcontrol.cpp \
+- controls/qvideodeviceselectorcontrol.cpp
++ controls/qvideodeviceselectorcontrol.cpp \
++ controls/qaudiorolecontrol.cpp
+
+diff --git a/src/multimedia/controls/qaudiorolecontrol.cpp b/src/multimedia/controls/qaudiorolecontrol.cpp
+new file mode 100644
+index 0000000..62696f0
+--- /dev/null
++++ b/src/multimedia/controls/qaudiorolecontrol.cpp
+@@ -0,0 +1,111 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 The Qt Company Ltd.
++** Contact: http://www.qt.io/licensing/
++**
++** This file is part of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** As a special exception, The Qt Company gives you certain additional
++** rights. These rights are described in The Qt Company LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qmediacontrol_p.h"
++#include "qaudiorolecontrol.h"
++
++QT_BEGIN_NAMESPACE
++
++/*!
++
--
qtmultimedia packaging
More information about the pkg-kde-commits
mailing list