Merge branch xenial_-_qt-5-12 into xenial_-_qt-5-12_-_wayland
commite2393228f942a9dfc36f282ce14a29757485d8ca
authorRatchanan Srirattanamet <ratchanan@ubports.com>
dateFri 25 Sep 2020, 03:45 (6 years ago)
parent9beb6b6577bbb7
qml/ApplicationMenus/ApplicationMenuItemFactory.qml+1−1
@@ -21,7 +21,7 @@ import QMenuModel 0.1
2121import Utils 0.1 as Utils
2222import Ubuntu.Components 1.3
2323
24−Object {
24+Item {
2525 id: menuFactory
2626
2727 property string context
qml/ApplicationMenus/RegisteredApplicationMenuModel.qml+1−1
@@ -20,7 +20,7 @@ import Unity.Indicators 0.1
2020import Unity.ApplicationMenu 0.1
2121import Unity.Indicators 0.1 as Indicators
2222
23−Object {
23+Item {
2424 property string persistentSurfaceId
2525 readonly property alias model: sharedAppModel.model
2626
qml/Panel/Indicators/IndicatorMenuItemFactory.qml+1−1
@@ -25,7 +25,7 @@ import Ubuntu.Components 1.3
2525import Unity.Session 0.1
2626import Unity.Platform 1.0
2727
28−Object {
28+Item {
2929 id: menuFactory
3030
3131 property string indicator
tests/qmltests/ApplicationMenuDataLoader.qml+1−1
@@ -20,7 +20,7 @@ import Unity.Application 0.1
2020import Unity.ApplicationMenu 0.1
2121import Unity.Indicators 0.1 as Indicators
2222
23−Object {
23+Item {
2424
2525 property alias surfaceManager: sMgrHandler.target
2626
tests/qmltests/Panel/tst_PanelMenuPage.qml+1−1
@@ -40,7 +40,7 @@ Item {
4040 menuModel: unityMenuModel
4141 submenuIndex: 0
4242
43− factory: Object {
43+ factory: Item {
4444 function load(model) {
4545 return standardMenuComponent;
4646 }