git.iko.soy/unity8
on xenial help sign in
Make the else branch use 5.0 instead of 5.4
9ce813aAlbert Astals Cid
qml/Components/NotificationAudio.qml+12−9
compare with xenial
unifiedsplit
@@ -19,6 +19,7 @@ import QtQuick 2.4
19Item {
19Item {
20 id: root
20 id: root
21 property string source: ""
21 property string source: ""
22+ readonly property var playbackState: priv.realAudio ? priv.realAudio.playbackState : 0
22
23
23 function play() {
24 function play() {
24 priv.audio.play();
25 priv.audio.play();
@@ -29,15 +30,17 @@ Item {
29
30
30 QtObject {
31 QtObject {
31 id: priv
32 id: priv
32− property var audio: null
33+ property var realAudio: null
33− }
34+ property var audio: {
34−
35+ if (realAudio === null) {
35− Component.onCompleted: {
36− try {
36+ try {
37− priv.audio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
37+ realAudio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
38− } catch(err) {
38+ } catch(err) {
39− console.log("Upstream audioRole enum not available, falling back to old role name.");
39+ console.log("Upstream audioRole enum not available, falling back to old role name.");
40− priv.audio = Qt.createQmlObject("import QtMultimedia 5.4; Audio { source: root.source; audioRole: MediaPlayer.alert }", priv)
40+ realAudio = Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert; onPlaybackStateChanged: console.log('sdfasdfasfd', playbackState); }", priv)
41+ }
42+ }
43+ return realAudio;
41 }
44 }
42 }
45 }
43}
46}
qml/Components/ScreenGrabber.qml−1
@@ -15,7 +15,6 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import QtMultimedia 5.0
19import ScreenGrabber 0.1
18import ScreenGrabber 0.1
20import GlobalShortcut 1.0
19import GlobalShortcut 1.0
21
20
qml/Notifications/Notification.qml−1
@@ -15,7 +15,6 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import QtMultimedia 5.0
19import Powerd 0.1
18import Powerd 0.1
20import Ubuntu.Components 1.2
19import Ubuntu.Components 1.2
21import Unity.Notifications 1.0
20import Unity.Notifications 1.0
tests/qmltests/Notifications/tst_OptionToggle.qml−1
@@ -24,7 +24,6 @@ import "../../../qml/Notifications"
24import Ubuntu.Components 0.1
24import Ubuntu.Components 0.1
25import Unity.Test 0.1
25import Unity.Test 0.1
26import Unity.Notifications 1.0
26import Unity.Notifications 1.0
27−import QtMultimedia 5.0
28
27
29Row {
28Row {
30 id: rootRow
29 id: rootRow