git.iko.soy/unity8
on xenial help sign in
Fix a couple qml warnings
bc94814Michael Terry
qml/Stages/ApplicationWindow.qml+1−1
compare with xenial
unifiedsplit
@@ -43,7 +43,7 @@ FocusScope {
43 readonly property color splashColor: root.application ? root.application.splashColor : "#00000000"
43 readonly property color splashColor: root.application ? root.application.splashColor : "#00000000"
44 readonly property color splashColorHeader: root.application ? root.application.splashColorHeader : "#00000000"
44 readonly property color splashColorHeader: root.application ? root.application.splashColorHeader : "#00000000"
45 readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
45 readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
46− readonly property url defaultScreenshot: root.application ? root.application.defaultScreenshot : ""
46+ readonly property url defaultScreenshot: (root.application && root.application.defaultScreenshot !== undefined) ? root.application.defaultScreenshot : ""
47
47
48 // Whether the Application had a surface before but lost it.
48 // Whether the Application had a surface before but lost it.
49 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
49 property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
qml/Stages/PhoneStage.qml+5−1
@@ -125,7 +125,11 @@ Rectangle {
125
125
126 onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);
126 onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);
127
127
128− onFocusedAppDelegateChanged: focusedAppDelegate.focus = true;
128+ onFocusedAppDelegateChanged: {
129+ if (focusedAppDelegate) {
130+ focusedAppDelegate.focus = true;
131+ }
132+ }
129
133
130 function indexOf(appId) {
134 function indexOf(appId) {
131 for (var i = 0; i < applicationManager.count; i++) {
135 for (var i = 0; i < applicationManager.count; i++) {