git.iko.soy/unity8
on xenial help sign in
Bumped deps requirements and fixed test
be39f78Andrea Cimitan
debian/control+2−2
compare with xenial
unifiedsplit
@@ -29,7 +29,7 @@ Build-Depends: cmake,
29 libqt5xmlpatterns5-dev,
29 libqt5xmlpatterns5-dev,
30 libsystemsettings-dev,
30 libsystemsettings-dev,
31 libudev-dev,
31 libudev-dev,
32− libunity-api-dev (>= 7.107),
32+ libunity-api-dev (>= 7.108),
33 libusermetricsoutput1-dev,
33 libusermetricsoutput1-dev,
34# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
34# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
35 libx11-dev[!armhf],
35 libx11-dev[!armhf],
@@ -134,7 +134,7 @@ Depends: qml-module-qtquick-layouts,
134 unity-application-impl-13,
134 unity-application-impl-13,
135 unity-notifications-impl-3,
135 unity-notifications-impl-3,
136 unity-plugin-scopes | unity-scopes-impl,
136 unity-plugin-scopes | unity-scopes-impl,
137− unity-scopes-impl-10,
137+ unity-scopes-impl-11,
138 unity8-fake-env | unity-application-impl,
138 unity8-fake-env | unity-application-impl,
139 ${misc:Depends},
139 ${misc:Depends},
140Breaks: unity8 (<< 7.86),
140Breaks: unity8 (<< 7.86),
plugins/Dash/CardSocialActions.qml+1−1
@@ -65,7 +65,7 @@ Column {
65 id: icon
65 id: icon
66 objectName: "icon"
66 objectName: "icon"
67
67
68− readonly property url urlIcon: "image://theme/ok"
68+ readonly property url urlIcon: modelData && modelData["icon"] || ""
69 readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
69 readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
70
70
71 height: units.gu(2)
71 height: units.gu(2)
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
8add_subdirectory(Screens)
8add_subdirectory(Screens)
9
9
10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
11−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
11+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)
12
12
13include_directories(
13include_directories(
14 ${CMAKE_CURRENT_BINARY_DIR}
14 ${CMAKE_CURRENT_BINARY_DIR}