diff options
Diffstat (limited to 'src/quick3d/quick3dscene2d/items/scene2d.cpp')
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index e679d56af..77d875cb5 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -10,9 +10,7 @@ #include <QtCore/qatomic.h> #include <QtGui/qevent.h> #include <QtGui/QOpenGLFunctions> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <QQuickRenderTarget> -#endif #include <private/qscene2d_p.h> #include <private/scene2d_p.h> @@ -37,7 +35,6 @@ QT_BEGIN_NAMESPACE #define GL_DEPTH24_STENCIL8 0x88F0 #endif -using namespace Qt3DRender::Quick; namespace Qt3DRender { @@ -45,6 +42,8 @@ namespace Render { namespace Quick { +using namespace Qt3DRender::Quick; + Q_GLOBAL_STATIC(QThread, renderThread) Q_GLOBAL_STATIC(QAtomicInt, renderThreadClientCount) @@ -214,11 +213,7 @@ void Scene2D::initializeRender() m_context->create(); m_context->makeCurrent(m_sharedObject->m_surface); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_sharedObject->m_renderControl->initialize(); -#else - m_sharedObject->m_renderControl->initialize(m_context); -#endif m_context->doneCurrent(); QCoreApplication::postEvent(m_sharedObject->m_renderManager, |