66e690e · unity8 · git.iko.soy

debian/control+1−1

compare with xenial

unifiedsplit

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

29 libqt5xmlpatterns5-dev,

30 libsystemsettings-dev,

31 libudev-dev,

32− libunity-api-dev (>= 7.105),

32+ libunity-api-dev (>= 7.107),

33 libusermetricsoutput1-dev,

34# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop

35 libx11-dev[!armhf],

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

@@ -8,7 +8,7 @@ add_subdirectory(DashCommunicator)

8add_subdirectory(Screens)

9

10pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

11−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)

11+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)

12

13include_directories(

14 ${CMAKE_CURRENT_BINARY_DIR}

tests/mocks/Unity/fake_resultsmodel.cpp+2

@@ -72,6 +72,8 @@ ResultsModel::data(const QModelIndex& index, int role) const

72 case RoleUri:

73 case RoleCategoryId:

74 case RoleDndUri:

75+ case RoleAttributes:

76+ case RoleSocialActions:

75 return QString();

77 return QString();

76 case RoleResult:

78 case RoleResult:

77 return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());

79 return QString("Result.%1.%2").arg(m_categoryId).arg(index.row());

tests/plugins/Dash/cardcreator/7.res−1

@@ -14,7 +14,6 @@ AbstractButton {

14 implicitWidth: childrenRect.width;

15 enabled: true;

16signal action(var actionId);

17−

18Loader {

17Loader {

19 id: backgroundLoader;

18 id: backgroundLoader;

20 objectName: "backgroundLoader";

19 objectName: "backgroundLoader";

tests/qmltests/Dash/tst_Card.qml+1−1

@@ -635,7 +635,7 @@ Rectangle {

635 }

636 }

637

638− function test_clicked() {

638+ function test_action() {

639 selector.selectedIndex = 0;

640 waitForRendering(card);

641