git.iko.soy/unity8
on xenial help sign in
Wops, actually layouts is 1.1 and not 1.2 ^_^
d9473c1Albert Astals Cid
plugins/Dash/CardAttributes.qml+1−1
compare with xenial
unifiedsplit
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20
20
21GridLayout {
21GridLayout {
qml/Components/ListItems/Header.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20
20
21Item {
21Item {
qml/Dash/Previews/PreviewTable.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import "../../Components"
20import "../../Components"
21
21
qml/Dash/ScopesListCategoryItem.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20
20
21MouseArea {
21MouseArea {
qml/Panel/Indicators/ModemInfoItem.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.3 as ListItem
20import Ubuntu.Components.ListItems 1.3 as ListItem
21
21
qml/Panel/Indicators/RoamingIndication.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20
20
21RowLayout {
21RowLayout {
qml/Panel/MenuContent.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Unity.Indicators 0.1 as Indicators
20import Unity.Indicators 0.1 as Indicators
21import Utils 0.1
21import Utils 0.1
tests/imports/check_imports.py+1−1
@@ -51,7 +51,7 @@ def raise_error(e):
51# the Qt version in debian/control and in CMakeLists.txt
51# the Qt version in debian/control and in CMakeLists.txt
52quick_pat = re.compile(r'.*import QtQuick.*$')
52quick_pat = re.compile(r'.*import QtQuick.*$')
53quick_good_pat = re.compile(r'.*import QtQuick 2\.4.*$')
53quick_good_pat = re.compile(r'.*import QtQuick 2\.4.*$')
54−quick_layouts_good_pat = re.compile(r'.*import QtQuick.Layouts 1\.2.*$')
54+quick_layouts_good_pat = re.compile(r'.*import QtQuick.Layouts 1\.1.*$')
55quick_window_good_pat = re.compile(r'.*import QtQuick.Window 2\.2.*$')
55quick_window_good_pat = re.compile(r'.*import QtQuick.Window 2\.2.*$')
56
56
57# Ubuntu Components patterns
57# Ubuntu Components patterns
tests/qmltests/Launcher/tst_Launcher.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Unity.Test 0.1
20import Unity.Test 0.1
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/IndicatorTest.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import "../../../qml/Panel"
20import "../../../qml/Panel"
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Unity.Test 0.1 as UT
19import Unity.Test 0.1 as UT
20import Unity.Indicators 0.1 as Indicators
20import Unity.Indicators 0.1 as Indicators
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_IndicatorItem.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21import Unity.Test 0.1 as UT
21import Unity.Test 0.1 as UT
tests/qmltests/Panel/tst_IndicatorItemRow.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import "../../../qml/Panel"
20import "../../../qml/Panel"
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_IndicatorsBar.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import "../../../qml/Panel"
20import "../../../qml/Panel"
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_IndicatorsMenu.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import "../../../qml/Panel"
20import "../../../qml/Panel"
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_Panel.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Unity.Test 0.1
20import Unity.Test 0.1
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Stages/ApplicationCheckBox.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Unity.Application 0.1
20import Unity.Application 0.1
21
21
tests/qmltests/Stages/RecursingChildSessionControl.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Unity.Application 0.1
20import Unity.Application 0.1
21
21
tests/qmltests/Stages/tst_ApplicationWindow.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import ".."
21import ".."
tests/qmltests/Stages/tst_SessionContainer.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import ".."
21import ".."
tests/qmltests/tst_OrientedShell.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtTest 1.0
19import QtTest 1.0
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.3 as ListItem
21import Ubuntu.Components.ListItems 1.3 as ListItem
tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Unity.Test 0.1
20import Unity.Test 0.1
21
21