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/rendernode/customrenderitem.cpp | |
| 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/rendernode/customrenderitem.cpp')
| -rw-r--r-- | examples/quick/scenegraph/rendernode/customrenderitem.cpp | 2 |
1 files changed, 1 insertions, 1 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 |