diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
| commit | f04c2c40fd7ee91e5cbff2ca4df0fdc30dfbbcd5 (patch) | |
| tree | 4e96d097987deb8d4d1a963e911dcbd1641a8502 /examples/quick/scenegraph | |
| parent | 0da811cdfebdae1d96c99fe681e6a776e73d2f7f (diff) | |
| parent | e76ed6a2655894bd671ee7397a15f2e57cfc8d33 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4variantobject.cpp
src/qml/types/qquickworkerscript.cpp
src/quick/scenegraph/util/qsgdefaultpainternode_p.h
tools/qmljs/qmljs.cpp
Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
Diffstat (limited to 'examples/quick/scenegraph')
4 files changed, 6 insertions, 7 deletions
diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index 2465f4cbc7..a92a400922 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -67,7 +67,7 @@ QSGNode *CustomRenderItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) break; #endif case QSGRendererInterface::Direct3D12: -#ifdef HAS_D3D12 +#if QT_CONFIG(d3d12) n = new D3D12RenderNode(this); break; #endif diff --git a/examples/quick/scenegraph/rendernode/d3d12renderer.cpp b/examples/quick/scenegraph/rendernode/d3d12renderer.cpp index d35f82a76a..3b377f1cb1 100644 --- a/examples/quick/scenegraph/rendernode/d3d12renderer.cpp +++ b/examples/quick/scenegraph/rendernode/d3d12renderer.cpp @@ -43,7 +43,7 @@ #include <QQuickWindow> #include <QSGRendererInterface> -#ifdef HAS_D3D12 +#if QT_CONFIG(d3d12) #include "vs_shader.hlslh" #include "ps_shader.hlslh" @@ -280,4 +280,4 @@ QRectF D3D12RenderNode::rect() const return QRect(0, 0, m_item->width(), m_item->height()); } -#endif // HAS_D3D12 +#endif // d3d12 diff --git a/examples/quick/scenegraph/rendernode/d3d12renderer.h b/examples/quick/scenegraph/rendernode/d3d12renderer.h index f13a1d451c..1d2726819f 100644 --- a/examples/quick/scenegraph/rendernode/d3d12renderer.h +++ b/examples/quick/scenegraph/rendernode/d3d12renderer.h @@ -43,7 +43,7 @@ #include <qsgrendernode.h> -#ifdef HAS_D3D12 +#if QT_CONFIG(d3d12) class QQuickItem; @@ -77,6 +77,6 @@ private: quint8 *cbPtr = nullptr; }; -#endif // HAS_D3D12 +#endif // d3d12 #endif diff --git a/examples/quick/scenegraph/rendernode/rendernode.pro b/examples/quick/scenegraph/rendernode/rendernode.pro index 851d5927bd..968902a5be 100644 --- a/examples/quick/scenegraph/rendernode/rendernode.pro +++ b/examples/quick/scenegraph/rendernode/rendernode.pro @@ -18,8 +18,7 @@ OTHER_FILES += \ main.qml \ shader.hlsl -config_d3d12 { - DEFINES += HAS_D3D12 +qtConfig(d3d12) { HEADERS += d3d12renderer.h SOURCES += d3d12renderer.cpp LIBS += -ld3d12 |