git.iko.soy/unity8
on xenial help sign in
Bumped deps requirements and fixed test
commitbe39f78d9a0e8ba6f1876cf75cac996aaf539211 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 7 Mar 2016, 13:10 (11 years ago) parentc5d0417
3 files changed+4−4
compare with xenial
unifiedsplit
debian/control+2−2 plugins/Dash/CardSocialActions.qml+1−1 tests/mocks/Unity/CMakeLists.txt+1−1
debian/control+2−2
@@ -29,7 +29,7 @@ Build-Depends: cmake,
2929 libqt5xmlpatterns5-dev,
3030 libsystemsettings-dev,
3131 libudev-dev,
32− libunity-api-dev (>= 7.107),
32+ libunity-api-dev (>= 7.108),
3333 libusermetricsoutput1-dev,
3434# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
3535 libx11-dev[!armhf],
@@ -134,7 +134,7 @@ Depends: qml-module-qtquick-layouts,
134134 unity-application-impl-13,
135135 unity-notifications-impl-3,
136136 unity-plugin-scopes | unity-scopes-impl,
137− unity-scopes-impl-10,
137+ unity-scopes-impl-11,
138138 unity8-fake-env | unity-application-impl,
139139 ${misc:Depends},
140140Breaks: unity8 (<< 7.86),
plugins/Dash/CardSocialActions.qml+1−1
@@ -65,7 +65,7 @@ Column {
6565 id: icon
6666 objectName: "icon"
6767
68− readonly property url urlIcon: "image://theme/ok"
68+ readonly property url urlIcon: modelData && modelData["icon"] || ""
6969 readonly property url urlTemporaryIcon: "temporaryIcon" in modelData && modelData["temporaryIcon"] || ""
7070
7171 height: units.gu(2)
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
88add_subdirectory(Screens)
99
1010pkg_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)
1212
1313include_directories(
1414 ${CMAKE_CURRENT_BINARY_DIR}