diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-26 08:38:15 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 12:17:58 +0000 |
| commit | 3da9e8d6714da3d9d6aec6932e4edae0a2135065 (patch) | |
| tree | 054ed3f57c9c8f6822a98dc3ef6d5e55ebd3ada9 /examples/qt3d/basicshapes-cpp | |
| parent | 5eb447f4ecbbab387573c3bb8a34298b652c032a (diff) | |
Move last remaining pieces of examples-common to Qt3DExtras
Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow)
Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/basicshapes-cpp')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/main.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro index 4e8152895..15eef0271 100644 --- a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro +++ b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro @@ -6,7 +6,7 @@ android|ios|tvos|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dinput +QT += 3dcore 3drender 3dinput 3dextras QT += widgets SOURCES += main.cpp \ diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index e01c0feeb..301aabb66 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -80,13 +80,13 @@ #include <Qt3DRender/qrenderaspect.h> #include <Qt3DExtras/qforwardrenderer.h> -#include "qt3dwindow.h" -#include "qfirstpersoncameracontroller.h" +#include <Qt3DExtras/qt3dwindow.h> +#include <Qt3DExtras/qfirstpersoncameracontroller.h> int main(int argc, char **argv) { QApplication app(argc, argv); - Qt3DWindow *view = new Qt3DWindow(); + Qt3DExtras::Qt3DWindow *view = new Qt3DExtras::Qt3DWindow(); view->defaultFramegraph()->setClearColor(QColor(QRgb(0x4d4d4f))); QWidget *container = QWidget::createWindowContainer(view); QSize screenSize = view->screen()->size(); @@ -117,7 +117,7 @@ int main(int argc, char **argv) cameraEntity->setViewCenter(QVector3D(0, 0, 0)); // For camera controls - Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(rootEntity); + Qt3DExtras::QFirstPersonCameraController *camController = new Qt3DExtras::QFirstPersonCameraController(rootEntity); camController->setCamera(cameraEntity); // Scenemodifier |