diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-30 16:10:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-02 06:34:02 +0000 |
| commit | ed6d778b20d0cdf2968e8d68085d33791ac33c49 (patch) | |
| tree | d97e5a36316371b199dca3774cae50ba4348172e /tests/auto/render/objectpicker | |
| parent | 77b04a10874870b6b41e7b788636b492f3da9075 (diff) | |
Remove QbackendNode::setPeer(QNode *)
...and fix up unit tests by using the QbackendNodeTester to simulate
the initialization performed by QAbstractAspectPrivate.
Change-Id: I61207f9f1631494f926552bef8eba33cc2a45850
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/objectpicker')
| -rw-r--r-- | tests/auto/render/objectpicker/objectpicker.pro | 1 | ||||
| -rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/render/objectpicker/objectpicker.pro b/tests/auto/render/objectpicker/objectpicker.pro index 237a89baa..e32ff09be 100644 --- a/tests/auto/render/objectpicker/objectpicker.pro +++ b/tests/auto/render/objectpicker/objectpicker.pro @@ -8,4 +8,5 @@ CONFIG += testcase SOURCES += tst_objectpicker.cpp +include(../../core/common/common.pri) include(../commons/commons.pri) diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index ca3d42a7f..abd37fdf0 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include <QtTest/QTest> +#include <qbackendnodetester.h> #include <Qt3DRender/private/objectpicker_p.h> #include <Qt3DRender/qpickevent.h> #include <Qt3DRender/qobjectpicker.h> @@ -35,7 +36,7 @@ #include "testpostmanarbiter.h" #include "testrenderer.h" -class tst_ObjectPicker : public QObject +class tst_ObjectPicker : public Qt3DCore::QBackendNodeTester { Q_OBJECT private Q_SLOTS: @@ -48,7 +49,7 @@ private Q_SLOTS: picker.setHoverEnabled(true); // WHEN - objectPicker.setPeer(&picker); + simulateInitialization(&picker, &objectPicker); // THEN QVERIFY(!objectPicker.peerId().isNull()); |