summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/basicshapes-cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-06-11 13:23:22 +0100
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2015-06-11 14:44:06 +0000
commit57f11fe309969665ddebafa3b770263d2d82fa93 (patch)
tree484fc5696c51acac5577d8d3b089826bdf7a940a /examples/qt3d/basicshapes-cpp
parentb21dfb2db3b48192e05dfdca9fdb85ed4bca02f2 (diff)
Move temporary window class to examples
So as to avoid public header without a QPrefix. Real integration points will be added later. Also removed it from the Qt3D namespace and fixed linkage. Task-number: QTBUG-46617 Change-Id: I1bea09f45f5fdba3d658b57b86b907ab57164479 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'examples/qt3d/basicshapes-cpp')
-rw-r--r--examples/qt3d/basicshapes-cpp/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index 3aa42f7f8..dc2317948 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -38,7 +38,7 @@
#include <QGuiApplication>
-#include <Qt3DCore/window.h>
+#include <window.h>
#include <Qt3DCore/qcamera.h>
#include <Qt3DCore/qentity.h>
#include <Qt3DCore/qcameralens.h>
@@ -74,7 +74,7 @@
int main(int argc, char **argv)
{
QApplication app(argc, argv);
- Qt3D::Window *view = new Qt3D::Window();
+ Window *view = new Window();
QWidget *container = QWidget::createWindowContainer(view);
QSize screenSize = view->screen()->size();