git.iko.soy/unity8
on xenial help sign in
reverted to sdk 1.2
2f6465cNick Dedekind
qml/Components/MediaServices/MediaServices.qml+1−1
compare with xenial
unifiedsplit
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 1.3
19+import Ubuntu.Components 1.2
20
20
21FocusScope {
21FocusScope {
22 id: root
22 id: root
qml/Components/MediaServices/MediaServicesControls.qml+1−1
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20−import Ubuntu.Components 1.3
20+import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Components.ListItems 1.0 as ListItem
22
22
23Item {
23Item {
qml/Components/MediaServices/MediaServicesHeader.qml+1−1
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
19+import Ubuntu.Components 1.2
20
20
21Item {
21Item {
22 id: root
22 id: root
qml/Components/MediaServices/VideoPlayerControls.qml+4−6
@@ -17,8 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20−import Ubuntu.Components 1.3
20+import Ubuntu.Components 1.2
21−import Ubuntu.Components.Themes 1.3
22
21
23MediaServicesControls {
22MediaServicesControls {
24 id: root
23 id: root
@@ -101,10 +100,9 @@ MediaServicesControls {
101 minimumValue: 0
100 minimumValue: 0
102 maximumValue: mediaPlayer.duration > 0 ? mediaPlayer.duration : 1
101 maximumValue: mediaPlayer.duration > 0 ? mediaPlayer.duration : 1
103 value: mediaPlayer.position
102 value: mediaPlayer.position
104− theme: ThemeSettings {
103+
105− palette: Palette {
104+ onStyleInstanceChanged: {
106− normal.base: "#F3F3E7"
105+ if (__styleInstance) __styleInstance.backgroundColor = "#F3F3E7";
107− }
108 }
106 }
109
107
110 onValueChanged: {
108 onValueChanged: {
qml/Dash/Previews/PreviewInlineVideo.qml+1−1
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.2
20import Ubuntu.Thumbnailer 0.1
20import Ubuntu.Thumbnailer 0.1
21//import Ubuntu.Content 0.1
21//import Ubuntu.Content 0.1
22import "../../Components/MediaServices"
22import "../../Components/MediaServices"
tests/mocks/QtMultimedia/VideoSurface.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 1.3
18+import Ubuntu.Components 1.2
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20
20
21Rectangle {
21Rectangle {
tests/qmltests/Components/tst_MediaServices.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import "../../../qml/Components/MediaServices"
19import "../../../qml/Components/MediaServices"
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21−import Ubuntu.Components 1.3
21+import Ubuntu.Components 1.2
22import QtMultimedia 5.0
22import QtMultimedia 5.0
23
23
24Rectangle {
24Rectangle {
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import "../../../../qml/Dash/Previews"
19import "../../../../qml/Dash/Previews"
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21−import Ubuntu.Components 1.3
21+import Ubuntu.Components 1.2
22import QtMultimedia 5.0
22import QtMultimedia 5.0
23
23
24Rectangle {
24Rectangle {