diff options
| author | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-11-14 11:31:53 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-11-14 10:39:07 +0000 |
| commit | 0d4096ab9d7785d05da7f3174070f0b5e91306d9 (patch) | |
| tree | 0a67f90837c9cac02272407de6d5cd636a67a0c0 /tests/auto/cpptest | |
| parent | bba7b9aced07a5183b3ba53c4c4cbccee471a691 (diff) | |
Fixed inability to set subviewports
Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553
Task-number: QTRD-1807
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'tests/auto/cpptest')
| -rw-r--r-- | tests/auto/cpptest/q3dscene/tst_scene.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/cpptest/q3dscene/tst_scene.cpp b/tests/auto/cpptest/q3dscene/tst_scene.cpp index 9e46feb0..1336f400 100644 --- a/tests/auto/cpptest/q3dscene/tst_scene.cpp +++ b/tests/auto/cpptest/q3dscene/tst_scene.cpp @@ -111,21 +111,25 @@ void tst_scene::initializeProperties() m_scene->setPrimarySubViewport(QRect(0, 0, 50, 50)); m_scene->setSecondarySubViewport(QRect(50, 50, 100, 100)); m_scene->setSecondarySubviewOnTop(false); - m_scene->setSelectionQueryPosition(QPoint(0, 0)); m_scene->setSlicingActive(true); + m_scene->setSelectionQueryPosition(QPoint(0, 0)); QCOMPARE(m_scene->activeCamera(), camera1); QCOMPARE(m_scene->activeLight(), light1); QCOMPARE(m_scene->devicePixelRatio(), 2.0f); QCOMPARE(m_scene->graphPositionQuery(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) - // TODO: subviewports are not set (QTRD-2435) - //QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50)); - //QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100)); + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 50, 50)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(50, 50, 100, 100)); QCOMPARE(m_scene->isSecondarySubviewOnTop(), false); QCOMPARE(m_scene->selectionQueryPosition(), QPoint(0, 0)); // TODO: When doing signal checks, add tests to check that queries return something (asynchronously) QCOMPARE(m_scene->isSlicingActive(), true); - // TODO: viewport is not set by subviewports (QTRD-2435) - //QCOMPARE(m_scene->viewport(), QRect(0, 0, 100, 100)); + QCOMPARE(m_scene->viewport(), QRect(0, 0, 150, 150)); + + m_scene->setPrimarySubViewport(QRect()); + m_scene->setSecondarySubViewport(QRect()); + + QCOMPARE(m_scene->primarySubViewport(), QRect(0, 0, 30, 30)); + QCOMPARE(m_scene->secondarySubViewport(), QRect(0, 0, 150, 150)); } void tst_scene::invalidProperties() |