git.iko.soy/unity8
on xenial help sign in
Fix import versions
78de4efAlbert Astals Cid
qml/Components/MediaServices/MediaServices.qml+2−2
compare with xenial
unifiedsplit
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 1.2
19+import Ubuntu.Components 1.3
20
20
21FocusScope {
21FocusScope {
22 id: root
22 id: root
qml/Components/MediaServices/MediaServicesControls.qml+3−3
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20−import Ubuntu.Components 1.2
20+import Ubuntu.Components 1.3
21−import Ubuntu.Components.ListItems 1.0 as ListItem
21+import Ubuntu.Components.ListItems 1.3 as ListItem
22
22
23Item {
23Item {
24 id: root
24 id: root
qml/Components/MediaServices/MediaServicesHeader.qml+2−2
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.3
17+import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import Ubuntu.Components 1.2
19+import Ubuntu.Components 1.3
20
20
21Item {
21Item {
22 id: root
22 id: root
qml/Components/MediaServices/VideoPlayer.qml+2−2
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 0.1
19+import Ubuntu.Components 1.3
20import Ubuntu.Thumbnailer 0.1
20import Ubuntu.Thumbnailer 0.1
21import "../../Components"
21import "../../Components"
22
22
qml/Components/MediaServices/VideoPlayerControls.qml+2−2
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20−import Ubuntu.Components 1.2
20+import Ubuntu.Components 1.3
21
21
22MediaServicesControls {
22MediaServicesControls {
23 id: root
23 id: root
qml/Dash/Previews/PreviewInlineVideo.qml+3−3
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18import QtMultimedia 5.0
18import QtMultimedia 5.0
19−import Ubuntu.Components 1.2
19+import Ubuntu.Components 1.3
20−import Ubuntu.Thumbnailer 0.1
20+import Ubuntu.Thumbnailer 1.3
21//import Ubuntu.Content 0.1
21//import Ubuntu.Content 0.1
22import "../../Components/MediaServices"
22import "../../Components/MediaServices"
23
23
tests/mocks/QtMultimedia/VideoSurface.qml+2−2
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
18−import Ubuntu.Components 1.2
18+import Ubuntu.Components 1.3
19import QtMultimedia 5.0
19import QtMultimedia 5.0
20
20
21Rectangle {
21Rectangle {
tests/qmltests/Components/tst_MediaServices.qml+2−2
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
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.2
21+import Ubuntu.Components 1.3
22import QtMultimedia 5.0
22import QtMultimedia 5.0
23
23
24Rectangle {
24Rectangle {
tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml+2−2
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.4
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.2
21+import Ubuntu.Components 1.3
22import QtMultimedia 5.0
22import QtMultimedia 5.0
23
23
24Rectangle {
24Rectangle {