diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-10-08 15:35:15 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-10-09 10:09:31 +0300 |
| commit | f3a73782738c5868541086eadd5e5c7b4aaabc14 (patch) | |
| tree | ee078b8e1de5a93c7d067e5ade243f5c411b3b2a /tests | |
| parent | a350868f0e49b52b5bb35ba5e320a0d7dc3f698a (diff) | |
Fix screen position based queries in threaded rendering environment
QtQuick's threaded renderer doesn't seem to always pair up sync and
render (or more accurately, beforeSynchronizing and node's
preprocess calls). Sometimes sync comes without a followup render,
or there are two syncs in a row, even though the sync is using
direct connection. Both of these cases broke the old
logic for handling position based queries.
Changed the logic to actually ensure we have resolved the query
before emitting the relevant signal.
Task-number: QTRD-3358
Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmldynamicdata/qml/qmldynamicdata/main.qml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml index 0ec9d277..29c51fb3 100644 --- a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml +++ b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml @@ -71,18 +71,16 @@ Rectangle { isIncreasing = false; } } else { - // TODO: Once QTRD-2645 is fixed, change this to remove from - // random index to add coverage. - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); - graphModel.remove(2); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); + graphModel.remove(Math.random() * (graphModel.count - 1)); if (graphModel.count == 2) { scatterGraph.theme.type = Theme3D.ThemeDigia; isIncreasing = true; @@ -118,6 +116,12 @@ Rectangle { shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium scene.activeCamera.yRotation: 30.0 inputHandler: null + axisX.min: 0 + axisY.min: 0 + axisZ.min: 0 + axisX.max: 1 + axisY.max: 1 + axisZ.max: 1 Scatter3DSeries { id: scatterSeries |