git.iko.soy/unity8
on xenial help sign in
Remove debug code
9749987Josh Arenson
qml/OrientedShell.qml+1−1
compare with xenial
unifiedsplit
@@ -161,7 +161,7 @@ Rectangle {
161 width: root.width
161 width: root.width
162 height: root.height
162 height: root.height
163 orientation: root.angleToOrientation(orientationAngle)
163 orientation: root.angleToOrientation(orientationAngle)
164− orientations: root.orientations ? root.orientations : ""
164+ orientations: root.orientations
165 nativeWidth: root.width
165 nativeWidth: root.width
166 nativeHeight: root.height
166 nativeHeight: root.height
167 mode: applicationArguments.mode
167 mode: applicationArguments.mode
tests/qmltests/tst_Shell.qml+2
@@ -31,6 +31,7 @@ import Powerd 0.1
31import Wizard 0.1 as Wizard
31import Wizard 0.1 as Wizard
32
32
33import "../../qml"
33import "../../qml"
34+import "../../qml/Components"
34import "Stages"
35import "Stages"
35
36
36Rectangle {
37Rectangle {
@@ -97,6 +98,7 @@ Rectangle {
97 id: __shell
98 id: __shell
98 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
99 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
99 orientation: Qt.PortraitOrientation
100 orientation: Qt.PortraitOrientation
101+ orientations: Orientations{ id: orientations }
100 Component.onDestruction: {
102 Component.onDestruction: {
101 shellLoader.itemDestroyed = true;
103 shellLoader.itemDestroyed = true;
102 }
104 }