git.iko.soy/unity8
on xenial help sign in
fix tst_surfaceContainer
e8fc1d4Lukáš Tinkl
tests/qmltests/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -90,7 +90,7 @@ add_unity8_qmltest(Stage ApplicationWindow)
90add_unity8_qmltest(Stage DesktopStage)
90add_unity8_qmltest(Stage DesktopStage)
91add_unity8_qmltest(Stage PhoneStage)
91add_unity8_qmltest(Stage PhoneStage)
92add_unity8_qmltest(Stages SpreadDelegate)
92add_unity8_qmltest(Stages SpreadDelegate)
93−add_unity8_qmltest(Stages SurfaceContainer)
93+add_unity8_qmltest(Stage SurfaceContainer)
94add_unity8_qmltest(Stages TabletStage)
94add_unity8_qmltest(Stages TabletStage)
95add_unity8_qmltest(Stage WindowResizeArea)
95add_unity8_qmltest(Stage WindowResizeArea)
96add_unity8_qmltest(Stage Splash)
96add_unity8_qmltest(Stage Splash)
tests/qmltests/Stage/tst_SurfaceContainer.qml+2−2
@@ -20,7 +20,7 @@ import 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
22import Unity.Application 0.1
22import Unity.Application 0.1
23−import "../../../qml/Stages"
23+import "../../../qml/Stage"
24
24
25Rectangle {
25Rectangle {
26 color: "red"
26 color: "red"
@@ -87,7 +87,7 @@ Rectangle {
87 }
87 }
88 Row {
88 Row {
89 CheckBox {id: promptCheckbox; checked: false; activeFocusOnPress: false
89 CheckBox {id: promptCheckbox; checked: false; activeFocusOnPress: false
90− enabled: surfaceContainerLoader.item.surface === null }
90+ enabled: surfaceContainerLoader.item && surfaceContainerLoader.item.surface === null }
91 Label { text: "isPromptSurface" }
91 Label { text: "isPromptSurface" }
92 }
92 }
93
93