diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2017-01-20 14:27:08 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-02-28 09:48:17 +0000 |
| commit | 154c3a9b44082a176a9700b5086a7bc758155a25 (patch) | |
| tree | 0a95efa2fcfe715a861602d0be9dce0d226c6ff1 /tests/auto/render/scene2d | |
| parent | 0bb720013d93c34d589c352a53405d8110fa57fe (diff) | |
Move scene2d to own module and implement conditional plugin loading
- Add quick3dscene2d module
- Add importsscene2d qml module
- Modify RenderAspect to load plugins conditionally
- change autotests to match the module change
Change-Id: If6596472acbd9a377561b2bfd2094a0585c781ac
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'tests/auto/render/scene2d')
| -rw-r--r-- | tests/auto/render/scene2d/scene2d.pro | 2 | ||||
| -rw-r--r-- | tests/auto/render/scene2d/tst_scene2d.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/render/scene2d/scene2d.pro b/tests/auto/render/scene2d/scene2d.pro index 8685b0b5b..aacdea3e4 100644 --- a/tests/auto/render/scene2d/scene2d.pro +++ b/tests/auto/render/scene2d/scene2d.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_scene2d -QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dquickrender 3dquickrender-private +QT += 3dcore 3dcore-private 3drender 3drender-private testlib 3dquickscene2d 3dquickscene2d-private CONFIG += testcase diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp index 45ea85b42..b53318e7c 100644 --- a/tests/auto/render/scene2d/tst_scene2d.cpp +++ b/tests/auto/render/scene2d/tst_scene2d.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include <QtTest/QTest> -#include <Qt3DQuickRender/qscene2d.h> +#include <Qt3DQuickScene2D/qscene2d.h> #include <private/qscene2d_p.h> #include <private/scene2d_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> |