git.iko.soy/unity8
on xenial help sign in
Merge
f2bbd25Albert Astals Cid
tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qml+2−1
compare with xenial
unifiedsplit
@@ -19,12 +19,13 @@ import QtTest 1.0
19import "../../../../qml/Dash/Filters"
19import "../../../../qml/Dash/Filters"
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import Unity 0.2
21import Unity 0.2
22+import Ubuntu.Components 1.3
22
23
23Rectangle {
24Rectangle {
24 id: root
25 id: root
25 width: units.gu(60)
26 width: units.gu(60)
26 height: units.gu(80)
27 height: units.gu(80)
27− color: Theme.palette.selected.background
28+ color: theme.palette.selected.background
28
29
29 property var singleSelectionWidgetData
30 property var singleSelectionWidgetData
30
31
tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qml+2−1
@@ -19,12 +19,13 @@ import QtTest 1.0
19import "../../../../qml/Dash/Filters"
19import "../../../../qml/Dash/Filters"
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21import Unity 0.2
21import Unity 0.2
22+import Ubuntu.Components 1.3
22
23
23Rectangle {
24Rectangle {
24 id: root
25 id: root
25 width: units.gu(60)
26 width: units.gu(60)
26 height: units.gu(80)
27 height: units.gu(80)
27− color: Theme.palette.selected.background
28+ color: theme.palette.selected.background
28
29
29 FilterWidgetFactory {
30 FilterWidgetFactory {
30 id: factory
31 id: factory