on xenial help sign in
Depend on ~aacid/unity-api/setMoveFavorite
bb6e579Albert Astals
debian/control+1−1
@@ -25,7 +25,7 @@ Build-Depends: cmake,
25 libpulse-dev,
25 libpulse-dev,
26 libqmenumodel-dev (>= 0.2.8),
26 libqmenumodel-dev (>= 0.2.8),
27 libqt5xmlpatterns5-dev,
27 libqt5xmlpatterns5-dev,
28− libunity-api-dev (>= 7.92),
28+ libunity-api-dev (>= 7.93),
29 libusermetricsoutput1-dev,
29 libusermetricsoutput1-dev,
30 libxcb1-dev,
30 libxcb1-dev,
31 pkg-config,
31 pkg-config,
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
8pkg_search_module(DEE dee-1.0 REQUIRED)
8pkg_search_module(DEE dee-1.0 REQUIRED)
9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
9pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
10pkg_search_module(DEEQT libdee-qt5 REQUIRED)
10pkg_search_module(DEEQT libdee-qt5 REQUIRED)
11−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
11+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=5)
12
12
13include_directories(
13include_directories(
14 ${CMAKE_CURRENT_BINARY_DIR}
14 ${CMAKE_CURRENT_BINARY_DIR}
tests/mocks/Unity/fake_scopes.h+2−3
@@ -55,9 +55,8 @@ public:
55 int count() const override;
55 int count() const override;
56 unity::shell::scopes::ScopeInterface* overviewScope() const override;
56 unity::shell::scopes::ScopeInterface* overviewScope() const override;
57
57
58− // TODO These will go to the api, mark as override
59− Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite);
58+ Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite) override;
60− Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index);
59+ Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index) override;
61
60
62 // This is used as part of implementation of the other C++ code, not API
61 // This is used as part of implementation of the other C++ code, not API
63 QList<Scope*> favScopes() const;
62 QList<Scope*> favScopes() const;