summaryrefslogtreecommitdiffstats
path: root/src/datavis3d/engine/q3dwindow.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-06-06 13:07:56 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-06-06 13:29:07 +0300
commit3898a82f6ad96274fc973db91fc6bbc0f9e9501f (patch)
treedb038c1e76588e7b00a588019cad7af9bd17b06d /src/datavis3d/engine/q3dwindow.cpp
parentf412e68d45fb3f629d793988d5350ad458809bc0 (diff)
QML2 Q3DBars hardcoded h4x0r version implemented
You can enable QML2 version of engine by uncommenting Change-Id: Ia12fcf9d503d648cc9792a4932e5f8b3488a743c Change-Id: Ia12fcf9d503d648cc9792a4932e5f8b3488a743c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/engine/q3dwindow.cpp')
-rw-r--r--src/datavis3d/engine/q3dwindow.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavis3d/engine/q3dwindow.cpp
index 359947c8..869dc328 100644
--- a/src/datavis3d/engine/q3dwindow.cpp
+++ b/src/datavis3d/engine/q3dwindow.cpp
@@ -70,12 +70,17 @@ Q3DWindow::Q3DWindow(QWindow *parent)
create();
+#ifndef USE_QML2_VERSION
d_ptr->m_context->setFormat(requestedFormat());
d_ptr->m_context->create();
d_ptr->m_context->makeCurrent(this);
+#endif
+
initializeOpenGLFunctions();
+#ifndef USE_QML2_VERSION
initialize();
+#endif
}
Q3DWindow::~Q3DWindow()