2d4caa6 · unity8 · git.iko.soy

plugins/Unity/Indicators/CMakeLists.txt+1−4

compare with xenial

unifiedsplit

@@ -51,7 +51,4 @@ target_link_libraries(IndicatorsQml

51

52qt5_use_modules(IndicatorsQml Core Qml Quick)

53

54−add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators

54+add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)

55− SEARCH_PATH qml

56− TARGETS IndicatorsQml

57−)

plugins/Unity/Indicators/qml/CachedUnityMenuModel.qml → plugins/Unity/Indicators/CachedUnityMenuModel.qmlrenamed

The content is the same.

plugins/Unity/Indicators/qml/qmldir → plugins/Unity/Indicators/qmldirrenamed

The content is the same.

qml/Panel/Indicators/DefaultIndicatorPage.qml+1−1

@@ -22,7 +22,7 @@ import QtQuick 2.0

22import Ubuntu.Components 0.1 as Components

23import Unity.Indicators 0.1 as Indicators

24

25−Indicators.IndicatorBase {

25+IndicatorBase {

26 id: main

27

28 //const

qml/Panel/Indicators/DefaultIndicatorWidget.qml+1−2

@@ -19,9 +19,8 @@

19

20import QtQuick 2.0

21import Ubuntu.Components 0.1

22−import Unity.Indicators 0.1 as Indicators

23

22

24−Indicators.IndicatorBase {

23+IndicatorBase {

25 id: indicatorWidget

24 id: indicatorWidget

26

25

27 property int iconSize: height

26 property int iconSize: height

plugins/Unity/Indicators/qml/IndicatorBase.qml → qml/Panel/Indicators/IndicatorBase.qmlrenamed+1−1

@@ -36,7 +36,7 @@ Item {

36

37 property alias menuModel: cachedModel.model

38

39− CachedUnityMenuModel {

39+ Indicators.CachedUnityMenuModel {

40 id: cachedModel

41 busName: indicatorItem.busName

42 actionsObjectPath: indicatorItem.actionsObjectPath

qml/Panel/Indicators/IndicatorDelegate.qml+1−2

@@ -18,9 +18,8 @@

18 */

19

20import QtQuick 2.0

21−import Unity.Indicators 0.1 as Indicators

22

21

23−Indicators.IndicatorBase {

22+IndicatorBase {

24 enabled: false

23 enabled: false

25

24

26 onRootActionStateChanged: {

25 onRootActionStateChanged: {