diff options
Diffstat (limited to 'src/quick3d/quick3dscene2d/items')
-rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.h | 2 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d.cpp | 8 | ||||
-rw-r--r-- | src/quick3d/quick3dscene2d/items/scene2d_p.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index 136d6347f..22708bf21 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -43,7 +43,7 @@ #include <QtCore/QUrl> #include <QtCore/QEvent> -#include <Qt3DCore/qnode.h> +#include <Qt3DCore/qentity.h> #include <QtQuick/qquickitem.h> diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 2b0a6580d..4e2dbcd18 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -244,7 +244,7 @@ void Scene2D::initializeRender() m_context->makeCurrent(m_sharedObject->m_surface); m_sharedObject->m_renderControl->initialize(m_context); -#ifdef QT_OPENGL_ES_2_ANGLE +#if QT_CONFIG(angle) m_usingAngle = false; if (m_context->isOpenGLES()) { const char *versionStr = reinterpret_cast<const char *>( @@ -309,7 +309,7 @@ void Scene2D::render() const Qt3DRender::Render::Attachment *attachmentData = nullptr; QMutex *textureLock = nullptr; -#ifdef QT_OPENGL_ES_2_ANGLE +#if QT_CONFIG(angle) QScopedPointer<SurfaceLocker> surfaceLocker; if (m_usingAngle) surfaceLocker.reset(new SurfaceLocker(m_sharedObject->m_surface)); @@ -329,7 +329,7 @@ void Scene2D::render() new Scene2DEvent(Scene2DEvent::Render)); return; } -#ifdef QT_OPENGL_ES_2_ANGLE +#if QT_CONFIG(angle) if (m_usingAngle == false) textureLock->lock(); #else @@ -382,7 +382,7 @@ void Scene2D::render() m_context->functions()->glFlush(); if (texture->isAutoMipMapGenerationEnabled()) texture->generateMipMaps(); -#ifdef QT_OPENGL_ES_2_ANGLE +#if QT_CONFIG(angle) if (m_usingAngle == false) textureLock->unlock(); #else diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h index c7626f73d..539602b2d 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d_p.h +++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h @@ -119,7 +119,7 @@ public: Qt3DRender::Quick::QScene2D::RenderPolicy m_renderPolicy; QVector<Qt3DCore::QNodeId> m_entities; Qt3DRender::QPickEventPtr m_cachedPickEvent; -#ifdef QT_OPENGL_ES_2_ANGLE +#if QT_CONFIG(angle) bool m_usingAngle; #endif QVector<QMetaObject::Connection> m_connections; |