diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-21 11:34:57 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-22 09:50:11 +0100 |
| commit | aa3813366a8e772cd58c9253461cf2dc50b97a9d (patch) | |
| tree | e306a60fa9b2d1f7dd2e6b245fdf05214c7c55df /examples/quick | |
| parent | 4241bb4d26ef69eb212e0274bad0926ec71bead9 (diff) | |
| parent | acb6ed0815f92588c3ff875a568e9561fe61218c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/qml/qqmlextensionplugin.cpp
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
Change-Id: Ic58d36a8532015bae30f2690063db9829b3bf372
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 2 | ||||
| -rw-r--r-- | examples/quick/scenegraph/rendernode/customrenderitem.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc index 2a584c26cc..55cbcd8f2e 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -29,7 +29,7 @@ \example scenegraph/metaltextureimport \title Scene Graph - Metal Texture Import \ingroup qtquickexamples - \brief Shows how to use a texture created directly with Metal + \brief Shows how to use a texture created directly with Metal. \image metaltextureimport-example.jpg diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index e55cf0a2f4..5f51522c47 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -53,8 +53,12 @@ #include <QSGRendererInterface> #include "openglrenderer.h" +#ifdef Q_OS_MACOS #include "metalrenderer.h" +#endif +#if QT_CONFIG(d3d12) #include "d3d12renderer.h" +#endif #include "softwarerenderer.h" //! [1] |