Merge lp:~mzanetti/unity8/40-50-90 into lp:unity8

Proposed by Michael Zanetti
Status: Superseded
Proposed branch: lp:~mzanetti/unity8/40-50-90
Merge into: lp:unity8
Diff against target: 539 lines (+82/-59)
15 files modified
qml/Launcher/Launcher.qml (+3/-2)
qml/OrientedShell.qml (+22/-1)
qml/Rotation/ImmediateRotationAction.qml (+4/-1)
qml/Rotation/NinetyRotationAnimation.qml (+6/-3)
qml/Shell.qml (+20/-15)
qml/Stages/PhoneStage.qml (+3/-2)
qml/Stages/TabletStage.qml (+7/-1)
src/ApplicationArguments.h (+5/-0)
src/main.cpp (+2/-1)
tests/autopilot/unity8/greeter/tests/test_args.py (+6/-6)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+0/-1)
tests/qmltests/Tutorial/tst_Tutorial.qml (+3/-10)
tests/qmltests/tst_OrientedShell.qml (+1/-12)
tests/qmltests/tst_Shell.qml (+0/-2)
tests/qmltests/tst_ShellWithPin.qml (+0/-2)
To merge this branch: bzr merge lp:~mzanetti/unity8/40-50-90
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+263487@code.launchpad.net

This proposal has been superseded by a proposal from 2015-07-01.

Commit message

Restrict the shell width to 40, 50 or 90 grid units when in portrait. Paint black borders to fill up screen space.

To post a comment you must log in.
lp:~mzanetti/unity8/40-50-90 updated
1836. By Michael Zanetti

revert bad change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~mzanetti/unity8/40-50-90 updated
1837. By Michael Zanetti

fix greeter not being swipable from the edge

1838. By Michael Zanetti

only use this weirdness when the native orientation is portrait

Unmerged revisions

1838. By Michael Zanetti

only use this weirdness when the native orientation is portrait

1837. By Michael Zanetti

fix greeter not being swipable from the edge

1836. By Michael Zanetti

revert bad change

1835. By Michael Zanetti

fixes

1834. By Michael Zanetti

fix mouse event eater in launcher

1833. By Michael Zanetti

restrict viewport to 40, 50 or 90 gu

1832. By Michael Zanetti

merge orientedShellFixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Launcher/Launcher.qml'
2--- qml/Launcher/Launcher.qml 2015-04-15 20:21:11 +0000
3+++ qml/Launcher/Launcher.qml 2015-07-01 09:37:44 +0000
4@@ -30,6 +30,7 @@
5
6 property int panelWidth: units.gu(8)
7 property int dragAreaWidth: units.gu(1)
8+ property int shellBorderWidth: 0
9 property int minimizeDistance: units.gu(26)
10 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
11 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
12@@ -266,7 +267,7 @@
13 // we don't trigger both, the dragArea and the hoverArea
14 MultiPointTouchArea {
15 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
16- width: units.dp(1)
17+ width: units.dp(1) + root.shellBorderWidth
18 mouseEnabled: false
19 enabled: parent.enabled
20 }
21@@ -279,7 +280,7 @@
22 direction: Direction.Rightwards
23
24 enabled: root.available
25- x: -root.x // so if launcher is adjusted relative to screen, we stay put (like tutorial does when teasing)
26+ x: -root.x - root.shellBorderWidth // so if launcher is adjusted relative to screen, we stay put (like tutorial does when teasing)
27 width: root.dragAreaWidth
28 height: root.height
29
30
31=== modified file 'qml/OrientedShell.qml'
32--- qml/OrientedShell.qml 2015-06-12 16:07:43 +0000
33+++ qml/OrientedShell.qml 2015-07-01 09:37:44 +0000
34@@ -20,6 +20,7 @@
35 import GSettings 1.0
36 import "Components"
37 import "Rotation"
38+import Ubuntu.Components 1.2
39
40 Rectangle {
41 id: root
42@@ -28,6 +29,9 @@
43 implicitWidth: units.gu(40)
44 implicitHeight: units.gu(71)
45
46+ property real screenGuCount: root.width / units.gu(1)
47+ property real usedGuCount: screenGuCount < 50 ? 40 : screenGuCount < 90 ? 50 : 90
48+
49 // NB: native and primary orientations here don't map exactly to their QScreen counterparts
50 readonly property int nativeOrientation: width > height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
51
52@@ -128,13 +132,16 @@
53 Shell {
54 id: shell
55 objectName: "shell"
56- width: root.width
57+ width: orientation == Qt.PortraitOrientation ? units.gu(root.usedGuCount) : root.width
58 height: root.height
59+ x: (root.width - width) / 2
60 orientation: root.angleToOrientation(orientationAngle)
61 primaryOrientation: root.primaryOrientation
62 nativeOrientation: root.nativeOrientation
63 nativeWidth: root.width
64 nativeHeight: root.height
65+ borderWidth: Math.max(0, shell.x)
66+ mode: applicationArguments.mode
67
68 // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
69 // what's the output device (eg: big TV, desktop monitor, phone display), etc.
70@@ -160,6 +167,20 @@
71 }
72
73 Rectangle {
74+ id: leftBorder
75+ color: "black"
76+ anchors { top: root.top; bottom: root.bottom; left: root.left }
77+ width: shell.x
78+ z: 10000
79+ }
80+ Rectangle {
81+ id: rightBorder
82+ color: "black"
83+ anchors { top: root.top; bottom: root.bottom; right: root.right }
84+ width: shell.x
85+ }
86+
87+ Rectangle {
88 id: shellCover
89 color: "black"
90 anchors.fill: parent
91
92=== modified file 'qml/Rotation/ImmediateRotationAction.qml'
93--- qml/Rotation/ImmediateRotationAction.qml 2015-04-01 16:33:31 +0000
94+++ qml/Rotation/ImmediateRotationAction.qml 2015-07-01 09:37:44 +0000
95@@ -25,12 +25,15 @@
96 shell.orientationAngle = info.requestedOrientationAngle;
97 shell.transformRotationAngle = info.requestedOrientationAngle;
98
99+ var toPortrait = orientedShell.angleToOrientation(info.requestedOrientationAngle) == Qt.PortraitOrientation;
100+ var usedWidth = toPortrait ? units.gu(orientedShell.usedGuCount) : orientedShell.width
101+
102 // Making bindings as orientedShell's dimensions might wiggle during startup.
103 if (info.requestedOrientationAngle === 90 || info.requestedOrientationAngle === 270) {
104 shell.width = Qt.binding(function() { return orientedShell.height; });
105 shell.height = Qt.binding(function() { return orientedShell.width; });
106 } else {
107- shell.width = Qt.binding(function() { return orientedShell.width; });
108+ shell.width = Qt.binding(function() { return usedWidth; });
109 shell.height = Qt.binding(function() { return orientedShell.height; });
110 }
111
112
113=== modified file 'qml/Rotation/NinetyRotationAnimation.qml'
114--- qml/Rotation/NinetyRotationAnimation.qml 2015-03-06 04:44:11 +0000
115+++ qml/Rotation/NinetyRotationAnimation.qml 2015-07-01 09:37:44 +0000
116@@ -15,6 +15,7 @@
117 */
118
119 import QtQuick 2.3
120+import Ubuntu.Components 1.2
121
122 SequentialAnimation {
123 id: root
124@@ -33,9 +34,11 @@
125 windowScreenshot.take();
126 windowScreenshot.visible = true;
127 shell.orientationAngle = root.toAngle;
128- shell.x = 0;
129- shell.width = flipShellDimensions ? orientedShell.height : orientedShell.width;
130- shell.height = flipShellDimensions ? orientedShell.width : orientedShell.height;
131+ var toPortrait = orientedShell.angleToOrientation(toAngle) == Qt.PortraitOrientation;
132+ var usedWidth = toPortrait ? units.gu(orientedShell.usedGuCount) : orientedShell.width
133+ shell.x = toPortrait ? (orientedShell.width - usedWidth) / 2 : 0;
134+ shell.width = flipShellDimensions ? orientedShell.height : (toPortrait ? usedWidth : orientedShell.width);
135+ shell.height = flipShellDimensions ? (toPortrait ? usedWidth : orientedShell.width) : orientedShell.height;
136 shell.transformOriginX = orientedShell.width / 2;
137 shell.transformOriginY = orientedShell.width / 2;
138 shell.updateFocusedAppOrientation();
139
140=== modified file 'qml/Shell.qml'
141--- qml/Shell.qml 2015-06-15 22:40:10 +0000
142+++ qml/Shell.qml 2015-07-01 09:37:44 +0000
143@@ -52,9 +52,11 @@
144 property int nativeOrientation
145 property real nativeWidth
146 property real nativeHeight
147+ property int borderWidth: 0
148 property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
149 property bool beingResized
150 property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
151+ property string mode: "full-greeter"
152 function updateFocusedAppOrientation() {
153 applicationsDisplayLoader.item.updateFocusedAppOrientation();
154 }
155@@ -68,9 +70,9 @@
156
157 readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed
158 && (applicationsDisplayLoader.item && applicationsDisplayLoader.item.orientationChangesEnabled)
159- && !greeter.animating
160+ && (!greeter || !greeter.animating)
161
162- readonly property bool showingGreeter: greeter.shown
163+ readonly property bool showingGreeter: greeter && greeter.shown
164
165 property bool startingUp: true
166 Timer { id: finishStartUpTimer; interval: 500; onTriggered: startingUp = false }
167@@ -79,7 +81,7 @@
168 if (startingUp) {
169 // Ensure we don't rotate during start up
170 return Qt.PrimaryOrientation;
171- } else if (greeter.shown) {
172+ } else if (greeter && greeter.shown) {
173 return Qt.PrimaryOrientation;
174 } else if (mainApp) {
175 return mainApp.supportedOrientations;
176@@ -101,16 +103,13 @@
177
178 // Disable everything while greeter is waiting, so that the user can't swipe
179 // the greeter or launcher until we know whether the session is locked.
180- enabled: !greeter.waiting
181+ enabled: greeter && !greeter.waiting
182
183 property real edgeSize: units.gu(2)
184 property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
185 property url background: asImageTester.status == Image.Ready ? asImageTester.source
186 : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
187
188- // This is _only_ used to expose the property to autopilot tests
189- readonly property string testShellMode: shellMode
190-
191 readonly property alias greeter: greeterLoader.item
192
193 function activateApplication(appId) {
194@@ -264,7 +263,7 @@
195 ? "phone"
196 : shell.usageScenario
197 source: {
198- if(shellMode === "greeter") {
199+ if(shell.mode === "greeter") {
200 return "Stages/ShimStage.qml"
201 } else if (applicationsDisplayLoader.usageScenario === "phone") {
202 return "Stages/PhoneStage.qml";
203@@ -276,7 +275,7 @@
204 }
205
206 property bool interactive: tutorial.spreadEnabled
207- && !greeter.shown
208+ && (!greeter || !greeter.shown)
209 && panel.indicators.fullyClosed
210 && launcher.progress == 0
211 && !notifications.useModal
212@@ -307,12 +306,12 @@
213 Binding {
214 target: applicationsDisplayLoader.item
215 property: "spreadEnabled"
216- value: tutorial.spreadEnabled && !greeter.hasLockedApp
217+ value: tutorial.spreadEnabled && (!greeter || !greeter.hasLockedApp)
218 }
219 Binding {
220 target: applicationsDisplayLoader.item
221 property: "inverseProgress"
222- value: greeter.locked ? 0 : launcher.progress
223+ value: greeter && greeter.locked ? 0 : launcher.progress
224 }
225 Binding {
226 target: applicationsDisplayLoader.item
227@@ -354,6 +353,11 @@
228 property: "beingResized"
229 value: shell.beingResized
230 }
231+ Binding {
232+ target: applicationsDisplayLoader.item
233+ property: "shellBorderWidth"
234+ value: shell.borderWidth
235+ }
236 }
237
238 Tutorial {
239@@ -422,7 +426,7 @@
240 id: greeterLoader
241 anchors.fill: parent
242 anchors.topMargin: panel.panelHeight
243- sourceComponent: shellMode != "shell" ? integratedGreeter :
244+ sourceComponent: shell.mode != "shell" ? integratedGreeter :
245 Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
246 onLoaded: {
247 item.objectName = "greeter"
248@@ -434,7 +438,7 @@
249 Greeter {
250
251 hides: [launcher, panel.indicators]
252- tabletMode: shell.sideStageEnabled
253+ tabletMode: shell.usageScenario != "phone"
254 launcherOffset: launcher.progress
255 forcedUnlock: tutorial.running
256 background: shell.background
257@@ -550,8 +554,8 @@
258 indicators {
259 hides: [launcher]
260 available: tutorial.panelEnabled
261- && (!greeter.locked || AccountsService.enableIndicatorsWhileLocked)
262- && !greeter.hasLockedApp
263+ && ((!greeter || !greeter.locked) || AccountsService.enableIndicatorsWhileLocked)
264+ && (!greeter || !greeter.hasLockedApp)
265 contentEnabled: tutorial.panelContentEnabled
266 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
267
268@@ -590,6 +594,7 @@
269 && !greeter.hasLockedApp
270 inverted: shell.usageScenario !== "desktop"
271 shadeBackground: !tutorial.running
272+ shellBorderWidth: shell.borderWidth
273
274 onShowDashHome: showHome()
275 onDash: showDash()
276
277=== modified file 'qml/Stages/PhoneStage.qml'
278--- qml/Stages/PhoneStage.qml 2015-06-18 19:39:35 +0000
279+++ qml/Stages/PhoneStage.qml 2015-07-01 09:37:44 +0000
280@@ -42,6 +42,7 @@
281 property int nativeOrientation
282 property real nativeWidth
283 property real nativeHeight
284+ property int shellBorderWidth: 0
285 property bool beingResized: false
286 onBeingResizedChanged: {
287 if (beingResized) {
288@@ -561,7 +562,7 @@
289 direction: Direction.Leftwards
290 enabled: (spreadView.phase != 2 && root.spreadEnabled) || dragging
291
292- anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: -root.dragAreaOverlap }
293+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: -root.dragAreaOverlap - root.shellBorderWidth }
294 width: root.dragAreaWidth
295
296 property var gesturePoints: new Array()
297@@ -570,7 +571,7 @@
298 if (dragging) {
299 // Gesture recognized. Let's move the spreadView with the finger
300 var dragX = Math.min(touchX + width, width); // Prevent dragging rightwards
301- dragX = -dragX + spreadDragArea.width - spreadView.shift;
302+ var dragX = -dragX + spreadDragArea.width - spreadView.shift;
303 // Don't allow dragging further than the animation crossing with phase2's animation
304 var maxMovement = spreadView.width * spreadView.positionMarker4 - spreadView.shift;
305
306
307=== modified file 'qml/Stages/TabletStage.qml'
308--- qml/Stages/TabletStage.qml 2015-06-18 19:39:35 +0000
309+++ qml/Stages/TabletStage.qml 2015-07-01 09:37:44 +0000
310@@ -42,6 +42,7 @@
311 property int nativeOrientation
312 property real nativeWidth
313 property real nativeHeight
314+ property int shellBorderWidth: 0
315 function updateFocusedAppOrientation() {
316 var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
317 if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
318@@ -730,10 +731,15 @@
319 enabled: spreadDragArea.dragging
320 }
321
322+ MouseArea {
323+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: -root.shellBorderWidth }
324+ width: root.shellBorderWidth
325+ }
326+
327 DirectionalDragArea {
328 id: spreadDragArea
329 objectName: "spreadDragArea"
330- anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
331+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: -root.shellBorderWidth }
332 width: root.dragAreaWidth
333 direction: Direction.Leftwards
334 enabled: (spreadView.phase != 2 && root.spreadEnabled) || dragging
335
336=== modified file 'src/ApplicationArguments.h'
337--- src/ApplicationArguments.h 2015-06-12 16:07:43 +0000
338+++ src/ApplicationArguments.h 2015-07-01 09:37:44 +0000
339@@ -27,14 +27,19 @@
340 {
341 Q_OBJECT
342 Q_PROPERTY(QString deviceName READ deviceName CONSTANT)
343+ Q_PROPERTY(QString mode READ mode CONSTANT)
344 public:
345 ApplicationArguments(QObject *parent = nullptr);
346
347 void setDeviceName(QString deviceName) { m_deviceName = deviceName; }
348 QString deviceName() const { return m_deviceName; }
349
350+ void setMode(QString mode) { m_mode = mode; }
351+ QString mode() const { return m_mode; }
352+
353 private:
354 QString m_deviceName;
355+ QString m_mode;
356 };
357
358 #endif // APPLICATION_ARGUMENTS_H
359
360=== modified file 'src/main.cpp'
361--- src/main.cpp 2015-06-12 16:07:43 +0000
362+++ src/main.cpp 2015-07-01 09:37:44 +0000
363@@ -60,6 +60,8 @@
364 qmlArgs.setDeviceName(QString(buffer));
365 }
366
367+ qmlArgs.setMode(parser.mode());
368+
369 // The testability driver is only loaded by QApplication but not by QGuiApplication.
370 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
371 if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
372@@ -92,7 +94,6 @@
373
374 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
375 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
376- view->rootContext()->setContextProperty("shellMode", parser.mode());
377 if (parser.hasFrameless()) {
378 view->setFlags(Qt::FramelessWindowHint);
379 }
380
381=== modified file 'tests/autopilot/unity8/greeter/tests/test_args.py'
382--- tests/autopilot/unity8/greeter/tests/test_args.py 2015-04-16 14:48:50 +0000
383+++ tests/autopilot/unity8/greeter/tests/test_args.py 2015-07-01 09:37:44 +0000
384@@ -28,27 +28,27 @@
385 def test_full_greeter_mode(self):
386 unity_proxy = self.launch_unity(mode='full-greeter')
387 shell = self.get_shell(unity_proxy)
388- self.assertTrue(shell.testShellMode == 'full-greeter')
389+ self.assertTrue(shell.mode == 'full-greeter')
390
391 def test_full_shell_mode(self):
392 unity_proxy = self.launch_unity(mode='full-shell')
393 shell = self.get_shell(unity_proxy)
394- self.assertTrue(shell.testShellMode == 'full-shell')
395+ self.assertTrue(shell.mode == 'full-shell')
396
397 def test_greeter_mode(self):
398 unity_proxy = self.launch_unity(mode='greeter')
399 shell = self.get_shell(unity_proxy)
400- self.assertTrue(shell.testShellMode == 'greeter')
401+ self.assertTrue(shell.mode == 'greeter')
402
403 def test_nonexistent_mode(self):
404 unity_proxy = self.launch_unity(mode=self.NONEXISTENT_MODE)
405 shell = self.get_shell(unity_proxy)
406- self.assertTrue(shell.testShellMode == self.DEFAULT_SHELL_MODE,
407+ self.assertTrue(shell.mode == self.DEFAULT_SHELL_MODE,
408 "Shell mode was {} but should have been {}"
409- .format(shell.testShellMode,
410+ .format(shell.mode,
411 self.DEFAULT_SHELL_MODE))
412
413 def test_shell_mode(self):
414 unity_proxy = self.launch_unity(mode='shell')
415 shell = self.get_shell(unity_proxy)
416- self.assertTrue(shell.testShellMode == 'shell')
417+ self.assertTrue(shell.mode == 'shell')
418
419=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
420--- tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-03-12 14:45:44 +0000
421+++ tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-07-01 09:37:44 +0000
422@@ -32,7 +32,6 @@
423 id: surfaceContainerComponent
424 SurfaceContainer {
425 anchors.fill: parent
426- orientation: Qt.PortraitOrientation
427 interactive: interactiveCheckbox.checked
428 }
429 }
430
431=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
432--- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-06-15 22:40:10 +0000
433+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-07-01 09:37:44 +0000
434@@ -17,7 +17,6 @@
435 import QtQuick 2.0
436 import QtTest 1.0
437 import AccountsService 0.1
438-import GSettings 1.0
439 import LightDM 0.1 as LightDM
440 import Ubuntu.Components 1.1
441 import Unity.Application 0.1
442@@ -46,11 +45,6 @@
443 }
444 }
445
446- GSettings {
447- id: unity8Settings
448- schema.id: "com.canonical.Unity8"
449- }
450-
451 Component.onCompleted: {
452 // must set the mock mode before loading the Shell
453 LightDM.Greeter.mockMode = "single-pin";
454@@ -73,7 +67,6 @@
455 sourceComponent: Component {
456 Shell {
457 property string indicatorProfile: "phone"
458- property string shellMode: "full-greeter" /* default */
459
460 Component.onDestruction: {
461 shellLoader.itemDestroyed = true;
462@@ -119,7 +112,7 @@
463
464 function init() {
465 tryCompare(shell, "enabled", true); // enabled by greeter when ready
466- unity8Settings.usageMode = "Staged";
467+
468 AccountsService.demoEdges = false;
469 AccountsService.demoEdges = true;
470 swipeAwayGreeter();
471@@ -193,7 +186,7 @@
472 }
473
474 function checkRightEdge() {
475- if (unity8Settings.usageMode === "Staged") {
476+ if (shell.usageScenario === "phone") {
477 touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);
478
479 var stage = findChild(shell, "stage");
480@@ -271,7 +264,7 @@
481 }
482
483 function test_walkthroughOnDesktop() {
484- unity8Settings.usageMode = "Windowed";
485+ shell.usageScenario = "desktop";
486 var page = goToPage("tutorialLeftFinish");
487 var tick = findChild(page, "tick");
488 tap(tick);
489
490=== modified file 'tests/qmltests/tst_OrientedShell.qml'
491--- tests/qmltests/tst_OrientedShell.qml 2015-05-11 14:36:03 +0000
492+++ tests/qmltests/tst_OrientedShell.qml 2015-07-01 09:37:44 +0000
493@@ -34,19 +34,8 @@
494
495 QtObject {
496 id: applicationArguments
497-
498- function hasGeometry() {
499- return false;
500- }
501-
502- function width() {
503- return 0;
504- }
505-
506- function height() {
507- return 0;
508- }
509 property string deviceName: "mako"
510+ property string mode: "full-greeter"
511 }
512
513 QtObject {
514
515=== modified file 'tests/qmltests/tst_Shell.qml'
516--- tests/qmltests/tst_Shell.qml 2015-06-18 18:17:09 +0000
517+++ tests/qmltests/tst_Shell.qml 2015-07-01 09:37:44 +0000
518@@ -81,8 +81,6 @@
519 property bool itemDestroyed: false
520 sourceComponent: Component {
521 Shell {
522- property string shellMode: "full-greeter" /* default */
523-
524 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
525 orientation: Qt.PortraitOrientation
526 primaryOrientation: Qt.PortraitOrientation
527
528=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
529--- tests/qmltests/tst_ShellWithPin.qml 2015-06-15 22:40:10 +0000
530+++ tests/qmltests/tst_ShellWithPin.qml 2015-07-01 09:37:44 +0000
531@@ -69,8 +69,6 @@
532 property bool itemDestroyed: false
533 sourceComponent: Component {
534 Shell {
535- property string shellMode: "full-greeter" /* default */
536-
537 Component.onDestruction: {
538 shellLoader.itemDestroyed = true
539 }

Subscribers

People subscribed via source and target branches