diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 01:00:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-10 01:00:21 +0200 |
| commit | 1bddf29287b4c42c321688376147d14bfecb46a1 (patch) | |
| tree | 2939d848a3a5496963aa2749b9deead6df9c49f4 /examples | |
| parent | a02b5d48cf63228ed8faf6abf4724df2c4500269 (diff) | |
| parent | 3fde977a817498817e98ce350d493658b0ed4458 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I2835748c27616103f275849141fbe5a93e3dfd8c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/scenegraph/rendernode/customrenderitem.cpp | 4 | ||||
| -rw-r--r-- | examples/quick/scenegraph/rendernode/metalrenderer.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.cpp b/examples/quick/scenegraph/rendernode/customrenderitem.cpp index 8aaa56c359..e55cf0a2f4 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.cpp +++ b/examples/quick/scenegraph/rendernode/customrenderitem.cpp @@ -87,7 +87,9 @@ QSGNode *CustomRenderItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) break; case QSGRendererInterface::MetalRhi: -#ifdef Q_OS_DARWIN +// Restore when QTBUG-78580 is done and the .pro is updated accordingly +//#ifdef Q_OS_DARWIN +#ifdef Q_OS_MACOS if (!n) { MetalRenderNode *metalNode = new MetalRenderNode; n = metalNode; diff --git a/examples/quick/scenegraph/rendernode/metalrenderer.h b/examples/quick/scenegraph/rendernode/metalrenderer.h index 31387a0e24..cf7fccb930 100644 --- a/examples/quick/scenegraph/rendernode/metalrenderer.h +++ b/examples/quick/scenegraph/rendernode/metalrenderer.h @@ -54,7 +54,8 @@ #include <qsgrendernode.h> #include <QQuickItem> -#ifdef Q_OS_DARWIN +//#ifdef Q_OS_DARWIN +#ifdef Q_OS_MACOS QT_BEGIN_NAMESPACE |