git.iko.soy/unity8
on xenial help sign in
reverted to sdk 1.2
commit2f6465ce811022a00627cf74050808c48647997d authorNick Dedekind <nick.dedekind@canonical.com> dateThu 25 Jun 2015, 10:04 (11 years ago) parentc4f030a
8 files changed+11−13
compare with xenial
unifiedsplit
qml/Components/MediaServices/MediaServices.qml+1−1 qml/Components/MediaServices/MediaServicesControls.qml+1−1 qml/Components/MediaServices/MediaServicesHeader.qml+1−1 qml/Components/MediaServices/VideoPlayerControls.qml+4−6 qml/Dash/Previews/PreviewInlineVideo.qml+1−1 tests/mocks/QtMultimedia/VideoSurface.qml+1−1 tests/qmltests/Components/tst_MediaServices.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
qml/Components/MediaServices/MediaServices.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtMultimedia 5.0
19−import Ubuntu.Components 1.3
19+import Ubuntu.Components 1.2
2020
2121FocusScope {
2222 id: root
qml/Components/MediaServices/MediaServicesControls.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
1919import QtMultimedia 5.0
20−import Ubuntu.Components 1.3
20+import Ubuntu.Components 1.2
2121import Ubuntu.Components.ListItems 1.0 as ListItem
2222
2323Item {
qml/Components/MediaServices/MediaServicesHeader.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.3
1818import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.3
19+import Ubuntu.Components 1.2
2020
2121Item {
2222 id: root
qml/Components/MediaServices/VideoPlayerControls.qml+4−6
@@ -17,8 +17,7 @@
1717import QtQuick 2.0
1818import QtQuick.Layouts 1.1
1919import QtMultimedia 5.0
20−import Ubuntu.Components 1.3
21−import Ubuntu.Components.Themes 1.3
20+import Ubuntu.Components 1.2
2221
2322MediaServicesControls {
2423 id: root
@@ -101,10 +100,9 @@ MediaServicesControls {
101100 minimumValue: 0
102101 maximumValue: mediaPlayer.duration > 0 ? mediaPlayer.duration : 1
103102 value: mediaPlayer.position
104− theme: ThemeSettings {
105− palette: Palette {
106− normal.base: "#F3F3E7"
107− }
103+
104+ onStyleInstanceChanged: {
105+ if (__styleInstance) __styleInstance.backgroundColor = "#F3F3E7";
108106 }
109107
110108 onValueChanged: {
qml/Dash/Previews/PreviewInlineVideo.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.2
2020import Ubuntu.Thumbnailer 0.1
2121//import Ubuntu.Content 0.1
2222import "../../Components/MediaServices"
tests/mocks/QtMultimedia/VideoSurface.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 1.3
18+import Ubuntu.Components 1.2
1919import QtMultimedia 5.0
2020
2121Rectangle {
tests/qmltests/Components/tst_MediaServices.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import "../../../qml/Components/MediaServices"
2020import Unity.Test 0.1 as UT
21−import Ubuntu.Components 1.3
21+import Ubuntu.Components 1.2
2222import QtMultimedia 5.0
2323
2424Rectangle {
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
21−import Ubuntu.Components 1.3
21+import Ubuntu.Components 1.2
2222import QtMultimedia 5.0
2323
2424Rectangle {