diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:47:32 +0100 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-12-12 12:23:04 +0200 |
commit | 54910f8cf827d6f9474de9f6f88b3a158a058c56 (patch) | |
tree | f8b425821436f02d099299799f794d26345e0d5a /tests | |
parent | 470330e69b7ee34beb27ed905fcb923d9cfdae31 (diff) | |
parent | 21c82c7e0db0a567c11ed80eac955d86ad0e1dff (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qmltest/scene3d/tst_scene.qml | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml index bd67a56f..08a55662 100644 --- a/tests/auto/qmltest/scene3d/tst_scene.qml +++ b/tests/auto/qmltest/scene3d/tst_scene.qml @@ -29,7 +29,7 @@ import QtQuick 2.0 import QtDataVisualization 1.2 -import QtTest 1.0 +import QtTest 1.1 Item { id: top @@ -45,7 +45,7 @@ Item { id: initialized scene.activeCamera: Camera3D { zoomLevel: 200 } scene.devicePixelRatio: 2.0 - //scene.graphPositionQuery: Qt.point(0, 0) // TODO: Unusable until QTBUG-40043 is fixed + scene.graphPositionQuery: Qt.point(0, 0) scene.primarySubViewport: Qt.rect(0, 0, 50, 50) scene.secondarySubViewport: Qt.rect(50, 50, 100, 100) scene.secondarySubviewOnTop: false @@ -94,13 +94,22 @@ Item { function test_initialized() { compare(initialized.scene.activeCamera.zoomLevel, 200) compare(initialized.scene.devicePixelRatio, 2.0) - //compare(initialized.scene.graphPositionQuery, Qt.point(0, 0)) // TODO: Unusable until QTBUG-40043 is fixed - compare(initialized.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) - compare(initialized.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100)) + compare(initialized.scene.graphPositionQuery, Qt.point(0, 0)) + compare(initialized.scene.primarySubViewport.x, 0) + compare(initialized.scene.primarySubViewport.y, 0) + compare(initialized.scene.primarySubViewport.width, 50) + compare(initialized.scene.primarySubViewport.height, 50) + compare(initialized.scene.secondarySubViewport.x, 50) + compare(initialized.scene.secondarySubViewport.y, 50) + compare(initialized.scene.secondarySubViewport.width, 100) + compare(initialized.scene.secondarySubViewport.height, 100) compare(initialized.scene.secondarySubviewOnTop, false) compare(initialized.scene.selectionQueryPosition, Qt.point(0, 0)) compare(initialized.scene.slicingActive, true) - compare(initialized.scene.viewport, Qt.rect(0, 0, 150, 150)) + compare(initialized.scene.viewport.x, 0) + compare(initialized.scene.viewport.y, 0) + compare(initialized.scene.viewport.width, 150) + compare(initialized.scene.viewport.height, 150) } } @@ -125,12 +134,21 @@ Item { compare(change.scene.activeCamera.zoomLevel, 200) compare(change.scene.devicePixelRatio, 2.0) compare(change.scene.graphPositionQuery, Qt.point(0, 0)) - compare(change.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) - compare(change.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100)) + compare(change.scene.primarySubViewport.x, 0) + compare(change.scene.primarySubViewport.y, 0) + compare(change.scene.primarySubViewport.width, 50) + compare(change.scene.primarySubViewport.height, 50) + compare(change.scene.secondarySubViewport.x, 50) + compare(change.scene.secondarySubViewport.y, 50) + compare(change.scene.secondarySubViewport.width, 100) + compare(change.scene.secondarySubViewport.height, 100) compare(change.scene.secondarySubviewOnTop, false) compare(change.scene.selectionQueryPosition, Qt.point(0, 0)) compare(change.scene.slicingActive, true) - compare(change.scene.viewport, Qt.rect(0, 0, 150, 150)) + compare(change.scene.viewport.x, 0) + compare(change.scene.viewport.y, 0) + compare(change.scene.viewport.width, 150) + compare(change.scene.viewport.height, 150) } } |