git.iko.soy/unity8
on xenial help sign in
Use Item instead of invalid internal Object type
577bbb7Rodney Dawes
qml/ApplicationMenus/ApplicationMenuItemFactory.qml+1−1
compare with xenial
unifiedsplit
@@ -21,7 +21,7 @@ import QMenuModel 0.1
21import Utils 0.1 as Utils
21import Utils 0.1 as Utils
22import Ubuntu.Components 1.3
22import Ubuntu.Components 1.3
23
23
24−Object {
24+Item {
25 id: menuFactory
25 id: menuFactory
26
26
27 property string context
27 property string context
qml/ApplicationMenus/RegisteredApplicationMenuModel.qml+1−1
@@ -20,7 +20,7 @@ import Unity.Indicators 0.1
20import Unity.ApplicationMenu 0.1
20import Unity.ApplicationMenu 0.1
21import Unity.Indicators 0.1 as Indicators
21import Unity.Indicators 0.1 as Indicators
22
22
23−Object {
23+Item {
24 property string persistentSurfaceId
24 property string persistentSurfaceId
25 readonly property alias model: sharedAppModel.model
25 readonly property alias model: sharedAppModel.model
26
26
qml/Panel/Indicators/IndicatorMenuItemFactory.qml+1−1
@@ -25,7 +25,7 @@ import Ubuntu.Components 1.3
25import Unity.Session 0.1
25import Unity.Session 0.1
26import Unity.Platform 1.0
26import Unity.Platform 1.0
27
27
28−Object {
28+Item {
29 id: menuFactory
29 id: menuFactory
30
30
31 property string indicator
31 property string indicator
tests/qmltests/ApplicationMenuDataLoader.qml+1−1
@@ -20,7 +20,7 @@ import Unity.Application 0.1
20import Unity.ApplicationMenu 0.1
20import Unity.ApplicationMenu 0.1
21import Unity.Indicators 0.1 as Indicators
21import Unity.Indicators 0.1 as Indicators
22
22
23−Object {
23+Item {
24
24
25 property alias surfaceManager: sMgrHandler.target
25 property alias surfaceManager: sMgrHandler.target
26
26
tests/qmltests/Panel/tst_PanelMenuPage.qml+1−1
@@ -40,7 +40,7 @@ Item {
40 menuModel: unityMenuModel
40 menuModel: unityMenuModel
41 submenuIndex: 0
41 submenuIndex: 0
42
42
43− factory: Object {
43+ factory: Item {
44 function load(model) {
44 function load(model) {
45 return standardMenuComponent;
45 return standardMenuComponent;
46 }
46 }