git.iko.soy/unity8
on xenial help sign in
Fix FTBFS when using latest unity-api
commit012a6a594e2e773535c1f8e030b388326915c79a authorMichal Hruby <michal.mhr@gmail.com> dateTue 8 Jul 2014, 10:23 (12 years ago) parente9e4027
4 files changed+13−2
compare with xenial
unifiedsplit
debian/control+1−1 tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/fake_scope.cpp+9 tests/mocks/Unity/fake_scope.h+2
debian/control+1−1
@@ -19,7 +19,7 @@ Build-Depends: cmake,
1919 libpulse-dev,
2020 libqmenumodel-dev (>= 0.2.7),
2121 libqt5xmlpatterns5-dev,
22− libunity-api-dev (>= 7.83),
22+ libunity-api-dev (>= 7.85),
2323 libunity-mir-dev,
2424 libusermetricsoutput1-dev,
2525 libxcb1-dev,
tests/mocks/Unity/CMakeLists.txt+1−1
@@ -6,7 +6,7 @@ add_subdirectory(Notifications)
66pkg_search_module(DEE dee-1.0 REQUIRED)
77pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
88pkg_search_module(DEEQT libdee-qt5 REQUIRED)
9−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=1)
9+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
1010
1111include_directories(
1212 ${CMAKE_CURRENT_BINARY_DIR}
tests/mocks/Unity/fake_scope.cpp+9
@@ -71,6 +71,10 @@ unity::shell::scopes::CategoriesInterface* Scope::categories() const {
7171 return m_categories;
7272}
7373
74+unity::shell::scopes::SettingsModelInterface* Scope::settings() const {
75+ return nullptr;
76+}
77+
7478QString Scope::noResultsHint() const {
7579 return m_noResultsHint;
7680}
@@ -182,3 +186,8 @@ void Scope::loadDepartment(const QString& id)
182186 m_currentDeparment = id;
183187 Q_EMIT currentDepartmentIdChanged();
184188}
189+
190+void Scope::performQuery(const QString& query)
191+{
192+ Q_UNUSED(query);
193+}
tests/mocks/Unity/fake_scope.h+2
@@ -46,6 +46,7 @@ public:
4646 QString noResultsHint() const override;
4747 QString formFactor() const override;
4848 bool isActive() const override;
49+ unity::shell::scopes::SettingsModelInterface* settings() const override;
4950
5051 /* setters */
5152 void setSearchQuery(const QString& search_query) override;
@@ -63,6 +64,7 @@ public:
6364 bool hasDepartments() const override;
6465 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
6566 Q_INVOKABLE void loadDepartment(const QString& id) override;
67+ Q_INVOKABLE void performQuery(const QString& query) override;
6668
6769 QVariantMap customizations() const override;
6870