4b36f44 · unity8 · git.iko.soy

qml/Dash/CardCarousel.qml+1−1

compare with xenial

unifiedsplit

@@ -49,7 +49,7 @@ DashRenderer {

49 objectName: "carouselDelegate" + index

50

51 function clicked() { cardCarousel.clicked(index, model.result, loader.item, model) }

52− function pressAndHold() { cardCarousel.pressAndHold(index, model) }

52+ function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }

53

54 sourceComponent: cardTool.cardComponent

55 onLoaded: {

qml/Dash/CardHorizontalList.qml+1−1

@@ -55,7 +55,7 @@ DashRenderer {

55 Connections {

56 target: loader.item

57 onClicked: root.clicked(index, result, loader.item, model)

58− onPressAndHold: root.pressAndHold(index, model)

58+ onPressAndHold: root.pressAndHold(index, result, model)

59 }

60 }

61 }

qml/Dash/CardVerticalJournal.qml+1−1

@@ -62,7 +62,7 @@ DashRenderer {

62 Connections {

63 target: loader.item

64 onClicked: root.clicked(index, result, loader.item, model)

65− onPressAndHold: root.pressAndHold(index, model)

65+ onPressAndHold: root.pressAndHold(index, result, model)

66 }

67 }

68 }

tests/qmltests/Dash/tst_PreviewListView.qml+5

@@ -35,6 +35,10 @@ Rectangle {

35 id: mockResultsModel

36 }

37

38+ Unity.FakePreviewModel {

39+ id: mockPreviewModel

40+ }

41+

38 PreviewListView {

42 PreviewListView {

39 id: listView

43 id: listView

40 anchors.fill: parent

44 anchors.fill: parent

@@ -58,6 +62,7 @@ Rectangle {

58 function init() {

62 function init() {

59 listView.model = mockResultsModel;

63 listView.model = mockResultsModel;

60 listView.currentIndex = 1;

64 listView.currentIndex = 1;

65+ listView.currentItem.previewModel = mockPreviewModel;

61 listView.open = true;

66 listView.open = true;

62 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");

67 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");

63 }

68 }