diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgtexture_platform.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgtexture_platform.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgtexture_platform.h b/src/quick/scenegraph/coreapi/qsgtexture_platform.h index f7e1591765..234f050bfc 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture_platform.h +++ b/src/quick/scenegraph/coreapi/qsgtexture_platform.h @@ -50,8 +50,8 @@ #include <QtGui/qvulkaninstance.h> #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) -Q_FORWARD_DECLARE_OBJC_CLASS(MTLTexture); +#if defined(__OBJC__) || defined(Q_CLANG_QDOC) +@protocol MTLTexture; #endif QT_BEGIN_NAMESPACE @@ -84,13 +84,13 @@ public: }; #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(__OBJC__) || defined(Q_CLANG_QDOC) class Q_QUICK_EXPORT QSGMetalTexture { public: virtual ~QSGMetalTexture(); - virtual MTLTexture *nativeTexture() const = 0; - static QSGTexture *fromNative(MTLTexture *texture, + virtual id<MTLTexture> nativeTexture() const = 0; + static QSGTexture *fromNative(id<MTLTexture> texture, QQuickWindow *window, const QSize &size, QQuickWindow::CreateTextureOptions options = {}); |