012a6a5 · unity8 · git.iko.soy

debian/control+1−1

compare with xenial

unifiedsplit

@@ -19,7 +19,7 @@ Build-Depends: cmake,

19 libpulse-dev,

20 libqmenumodel-dev (>= 0.2.7),

21 libqt5xmlpatterns5-dev,

22− libunity-api-dev (>= 7.83),

22+ libunity-api-dev (>= 7.85),

23 libunity-mir-dev,

24 libusermetricsoutput1-dev,

25 libxcb1-dev,

tests/mocks/Unity/CMakeLists.txt+1−1

@@ -6,7 +6,7 @@ add_subdirectory(Notifications)

6pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

8pkg_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)

10

11include_directories(

12 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_scope.cpp+9

@@ -71,6 +71,10 @@ unity::shell::scopes::CategoriesInterface* Scope::categories() const {

71 return m_categories;

72}

73

74+unity::shell::scopes::SettingsModelInterface* Scope::settings() const {

75+ return nullptr;

76+}

77+

74QString Scope::noResultsHint() const {

78QString Scope::noResultsHint() const {

75 return m_noResultsHint;

79 return m_noResultsHint;

76}

80}

@@ -182,3 +186,8 @@ void Scope::loadDepartment(const QString& id)

182 m_currentDeparment = id;

186 m_currentDeparment = id;

183 Q_EMIT currentDepartmentIdChanged();

187 Q_EMIT currentDepartmentIdChanged();

184}

188}

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:

46 QString noResultsHint() const override;

47 QString formFactor() const override;

48 bool isActive() const override;

49+ unity::shell::scopes::SettingsModelInterface* settings() const override;

49

50

50 /* setters */

51 /* setters */

51 void setSearchQuery(const QString& search_query) override;

52 void setSearchQuery(const QString& search_query) override;

@@ -63,6 +64,7 @@ public:

63 bool hasDepartments() const override;

64 bool hasDepartments() const override;

64 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

65 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

65 Q_INVOKABLE void loadDepartment(const QString& id) override;

66 Q_INVOKABLE void loadDepartment(const QString& id) override;

67+ Q_INVOKABLE void performQuery(const QString& query) override;

66

68

67 QVariantMap customizations() const override;

69 QVariantMap customizations() const override;

68

70