diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-08 10:09:05 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-10-09 11:44:49 +0200 |
| commit | 2b845c91756bcd0f5763752eccc254ca2b4a2cc0 (patch) | |
| tree | 6c42de5a7ad9f948fff7958bb84b6ba9c8c5717f /examples | |
| parent | da4069a96b97acb180023eae4ee5f2096613e51f (diff) | |
Make rendernode example compile on iOS
Without Metal support for now.
The ifdef pattern is the same as in QRhi in qtbase. It is to be revised
once Metal support is introduced for iOS.
Task-number: QTBUG-78854
Change-Id: I10f37ddcb42c27958270bd3ca8bf9b8457a4bea3
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
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 |