on xenial help sign in
Depend on ~aacid/unity-api/setMoveFavorite
commitbb6e5798630024c0241ceefdd41ef20a2bd20bf1 authorAlbert Astals <albert.astals@canonical.com> dateWed 22 Oct 2014, 09:59 (12 years ago) parent49f86d5
3 files changed+4−5
debian/control+1−1 tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_scopes.h+2−3
debian/control+1−1
@@ -25,7 +25,7 @@ Build-Depends: cmake,
2525 libpulse-dev,
2626 libqmenumodel-dev (>= 0.2.8),
2727 libqt5xmlpatterns5-dev,
28− libunity-api-dev (>= 7.92),
28+ libunity-api-dev (>= 7.93),
2929 libusermetricsoutput1-dev,
3030 libxcb1-dev,
3131 pkg-config,
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)
88pkg_search_module(DEE dee-1.0 REQUIRED)
99pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
1010pkg_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)
1212
1313include_directories(
1414 ${CMAKE_CURRENT_BINARY_DIR}
tests/mocks/Unity/fake_scopes.h+2−3
@@ -55,9 +55,8 @@ public:
5555 int count() const override;
5656 unity::shell::scopes::ScopeInterface* overviewScope() const override;
5757
58− // TODO These will go to the api, mark as override
59− Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite);
60− Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index);
58+ Q_INVOKABLE void setFavorite(const QString& scopeId, bool favorite) override;
59+ Q_INVOKABLE void moveFavoriteTo(const QString& scopeId, int index) override;
6160
6261 // This is used as part of implementation of the other C++ code, not API
6362 QList<Scope*> favScopes() const;