diff options
Diffstat (limited to 'tests/auto/qmltest/scene3d/tst_scene.qml')
| -rw-r--r-- | tests/auto/qmltest/scene3d/tst_scene.qml | 101 |
1 files changed, 36 insertions, 65 deletions
diff --git a/tests/auto/qmltest/scene3d/tst_scene.qml b/tests/auto/qmltest/scene3d/tst_scene.qml index e653a781..08a55662 100644 --- a/tests/auto/qmltest/scene3d/tst_scene.qml +++ b/tests/auto/qmltest/scene3d/tst_scene.qml @@ -70,30 +70,21 @@ Item { compare(initial.scene.devicePixelRatio, 1.0) compare(initial.scene.graphPositionQuery, Qt.point(-1, -1)) compare(initial.scene.invalidSelectionPoint, Qt.point(-1, -1)) - // TODO: subviewports are not set (QTRD-1807) - //compare(initial.scene.primarySubViewport.x, 0) - //compare(initial.scene.primarySubViewport.y, 0) - //compare(initial.scene.primarySubViewport.width, 0) - //compare(initial.scene.primarySubViewport.height, 0) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initial.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) - // TODO: subviewports are not set (QTRD-1807) - //compare(initial.scene.secondarySubViewport.x, 0) - //compare(initial.scene.secondarySubViewport.y, 0) - //compare(initial.scene.secondarySubViewport.width, 0) - //compare(initial.scene.secondarySubViewport.height, 0) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initial.scene.secondarySubViewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.primarySubViewport.x, 0) + compare(initial.scene.primarySubViewport.y, 0) + compare(initial.scene.primarySubViewport.width, 0) + compare(initial.scene.primarySubViewport.height, 0) + compare(initial.scene.secondarySubViewport.x, 0) + compare(initial.scene.secondarySubViewport.y, 0) + compare(initial.scene.secondarySubViewport.width, 0) + compare(initial.scene.secondarySubViewport.height, 0) compare(initial.scene.secondarySubviewOnTop, true) compare(initial.scene.selectionQueryPosition, Qt.point(-1, -1)) compare(initial.scene.slicingActive, false) - // TODO: viewport is not set by subviewports (QTRD-1807) - //compare(initial.scene.viewport.x, 0) - //compare(initial.scene.viewport.y, 0) - //compare(initial.scene.viewport.width, 0) - //compare(initial.scene.viewport.height, 0) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initial.scene.viewport, Qt.rect(0, 0, 0, 0)) + compare(initial.scene.viewport.x, 0) + compare(initial.scene.viewport.y, 0) + compare(initial.scene.viewport.width, 0) + compare(initial.scene.viewport.height, 0) } } @@ -104,30 +95,21 @@ Item { compare(initialized.scene.activeCamera.zoomLevel, 200) compare(initialized.scene.devicePixelRatio, 2.0) compare(initialized.scene.graphPositionQuery, Qt.point(0, 0)) - // TODO: subviewports are not set (QTRD-1807) - //compare(initialized.scene.primarySubViewport.x, 0) - //compare(initialized.scene.primarySubViewport.y, 0) - //compare(initialized.scene.primarySubViewport.width, 50) - //compare(initialized.scene.primarySubViewport.height, 50) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initialized.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) - // TODO: subviewports are not set (QTRD-1807) - //compare(initialized.scene.secondarySubViewport.x, 50) - //compare(initialized.scene.secondarySubViewport.y, 50) - //compare(initialized.scene.secondarySubViewport.width, 100) - //compare(initialized.scene.secondarySubViewport.height, 100) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initialized.scene.secondarySubViewport, Qt.rect(50, 50, 100, 100)) + 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) - // TODO: viewport is not set by subviewports (QTRD-1807) - //compare(initialized.scene.viewport.x, 50) - //compare(initialized.scene.viewport.y, 50) - //compare(initialized.scene.viewport.width, 100) - //compare(initialized.scene.viewport.height, 100) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(initialized.scene.viewport, Qt.rect(0, 0, 100, 100)) + compare(initialized.scene.viewport.x, 0) + compare(initialized.scene.viewport.y, 0) + compare(initialized.scene.viewport.width, 150) + compare(initialized.scene.viewport.height, 150) } } @@ -152,30 +134,21 @@ Item { compare(change.scene.activeCamera.zoomLevel, 200) compare(change.scene.devicePixelRatio, 2.0) compare(change.scene.graphPositionQuery, Qt.point(0, 0)) - // TODO: subviewports are not set (QTRD-1807) - //compare(change.scene.primarySubViewport.x, 0) - //compare(change.scene.primarySubViewport.y, 0) - //compare(change.scene.primarySubViewport.width, 50) - //compare(change.scene.primarySubViewport.height, 50) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(change.scene.primarySubViewport, Qt.rect(0, 0, 50, 50)) - // TODO: subviewports are not set (QTRD-1807) - //compare(change.scene.secondarySubViewport.x, 50) - //compare(change.scene.secondarySubViewport.y, 50) - //compare(change.scene.secondarySubViewport.width, 100) - //compare(change.scene.secondarySubViewport.height, 100) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //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) - // TODO: viewport is not set by subviewports (QTRD-1807) - //compare(change.scene.viewport.x, 0) - //compare(change.scene.viewport.y, 0) - //compare(change.scene.viewport.width, 100) - //compare(change.scene.viewport.height, 100) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(change.scene.viewport, Qt.rect(0, 0, 100, 100)) + compare(change.scene.viewport.x, 0) + compare(change.scene.viewport.y, 0) + compare(change.scene.viewport.width, 150) + compare(change.scene.viewport.height, 150) } } @@ -188,8 +161,6 @@ Item { compare(invalid.scene.primarySubViewport.y, 0) compare(invalid.scene.primarySubViewport.width, 0) compare(invalid.scene.primarySubViewport.height, 0) - // For some reason comparing like this fails in 5.8.0 (QRect vs. QRectF) - //compare(change.scene.primarySubViewport, Qt.rect(0, 0, 0, 0)) } } } |