summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-14 09:06:06 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-14 09:26:37 +0300
commit5f9be2bd06a3f0f8286325ad1eb323aa692126eb (patch)
treedb6240e2768d000f43df0a80023e80077e889baa /tests
parentc5e993ad507cc0d56d0e2a62076584d020086ad7 (diff)
Multi-match behavior implementation for surface item model proxy
Task-number: QTRD-3074 Change-Id: I2dc67f0c524bce87498129bbc462bd8f014b8d2c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qmlmultitest/qml/qmlmultitest/main.qml4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/qmlmultitest/qml/qmlmultitest/main.qml b/tests/qmlmultitest/qml/qmlmultitest/main.qml
index b5a62902..e71b30de 100644
--- a/tests/qmlmultitest/qml/qmlmultitest/main.qml
+++ b/tests/qmlmultitest/qml/qmlmultitest/main.qml
@@ -229,15 +229,19 @@ Rectangle {
function changeMMB() {
if (barProxy.multiMatchBehavior === ItemModelBarDataProxy.MMBLast) {
barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBAverage
+ surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBAverage
mmbButton.text = "MMB: Average"
} else if (barProxy.multiMatchBehavior === ItemModelBarDataProxy.MMBAverage) {
barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBCumulative
+ surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBCumulativeY
mmbButton.text = "MMB: Cumulative"
} else if (barProxy.multiMatchBehavior === ItemModelBarDataProxy.MMBCumulative) {
barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBFirst
+ surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBFirst
mmbButton.text = "MMB: First"
} else {
barProxy.multiMatchBehavior = ItemModelBarDataProxy.MMBLast
+ surfaceProxy.multiMatchBehavior = ItemModelSurfaceDataProxy.MMBLast
mmbButton.text = "MMB: Last"
}
}