diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2020-04-21 15:40:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-21 15:41:26 +0200 |
| commit | 18b319f919f71c6b476675d832d1b8a2bda118c2 (patch) | |
| tree | 0ed74eff9f5892dc372a136d05454c8213ad1d4c /examples/qt3d | |
| parent | e326d8b7d7c96a628667d0a464f3c1e776d7cf1b (diff) | |
| parent | dec1f5912acb991985e96ca2cb7e5c265c737a6f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
src/plugins/renderers/opengl/renderer/renderer.cpp
src/render/backend/attachmentpack_p.h
src/render/frontend/qrenderaspect.cpp
src/render/picking/qabstractraycaster.cpp
tests/manual/manual.pro
Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
Diffstat (limited to 'examples/qt3d')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/main.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index fffb83a20..a347e9fb2 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -63,8 +63,6 @@ #include <QtWidgets/QCommandLinkButton> #include <QtGui/QScreen> -#include <Qt3DInput/QInputAspect> - #include <Qt3DExtras/qtorusmesh.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qtechnique.h> @@ -103,9 +101,6 @@ int main(int argc, char **argv) widget->setWindowTitle(QStringLiteral("Basic shapes")); - Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; - view->registerAspect(input); - // Root entity Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); |