diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-14 19:01:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-14 19:01:23 +0100 |
commit | 0e80d28aa5892d6bbb4d0017b1bc9a33489f4176 (patch) | |
tree | 0db2e10c8776d172bccaeaa7ee1fab3934b93073 /examples/quick/scenegraph | |
parent | ed32558d6280cae40578f735fd326327d571d993 (diff) | |
parent | 16c81bb0d493af00bc376784bcb7e03a4a037b04 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
src/qml/qml/qqmlimport.cpp
src/quick/items/context2d/qquickcontext2dtexture_p.h
tools/qmleasing/splineeditor.h
Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
Diffstat (limited to 'examples/quick/scenegraph')
4 files changed, 5 insertions, 6 deletions
diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index a92a400922..27c55bf86d 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -62,7 +62,7 @@ QSGNode *CustomRenderItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) return nullptr; switch (ri->graphicsApi()) { case QSGRendererInterface::OpenGL: -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) n = new OpenGLRenderNode(this); break; #endif diff --git a/examples/quick/scenegraph/rendernode/openglrenderer.cpp b/examples/quick/scenegraph/rendernode/openglrenderer.cpp index 2edb6bd929..c84867797d 100644 --- a/examples/quick/scenegraph/rendernode/openglrenderer.cpp +++ b/examples/quick/scenegraph/rendernode/openglrenderer.cpp @@ -41,7 +41,7 @@ #include "openglrenderer.h" #include <QQuickItem> -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) #include <QOpenGLShaderProgram> #include <QOpenGLBuffer> @@ -161,4 +161,4 @@ QRectF OpenGLRenderNode::rect() const return QRect(0, 0, m_item->width(), m_item->height()); } -#endif // QT_NO_OPENGL +#endif // opengl diff --git a/examples/quick/scenegraph/rendernode/openglrenderer.h b/examples/quick/scenegraph/rendernode/openglrenderer.h index 92cc2bc72b..ea2bbcbc38 100644 --- a/examples/quick/scenegraph/rendernode/openglrenderer.h +++ b/examples/quick/scenegraph/rendernode/openglrenderer.h @@ -43,7 +43,7 @@ #include <qsgrendernode.h> -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) QT_BEGIN_NAMESPACE @@ -75,6 +75,6 @@ private: QT_END_NAMESPACE -#endif // QT_NO_OPENGL +#endif // opengl #endif diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index e13e8198b0..2efeb5ed83 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -7,7 +7,6 @@ qtConfig(opengl(es1|es2)?) { sgengine \ textureinsgnode \ openglunderqml \ - textureinsgnode \ textureinthread \ twotextureproviders } |