diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickgraphicsdevice.cpp | 12 | ||||
-rw-r--r-- | src/quick/items/qquickgraphicsdevice.h | 10 | ||||
-rw-r--r-- | src/quick/items/qquickrendertarget.cpp | 8 | ||||
-rw-r--r-- | src/quick/items/qquickrendertarget.h | 10 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.h | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgtexture.cpp | 8 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgtexture_platform.h | 10 | ||||
-rw-r--r-- | src/quicknativestyle/qstyle/qquickdrawutil.cpp | 2 | ||||
-rw-r--r-- | src/quicknativestyle/qstyle/qquickdrawutil.h | 4 |
9 files changed, 33 insertions, 33 deletions
diff --git a/src/quick/items/qquickgraphicsdevice.cpp b/src/quick/items/qquickgraphicsdevice.cpp index f62cf95468..5bd0865660 100644 --- a/src/quick/items/qquickgraphicsdevice.cpp +++ b/src/quick/items/qquickgraphicsdevice.cpp @@ -79,7 +79,7 @@ bool QQuickGraphicsDevice::isNull() const the associated QSurfaceFormat, or threading issues due to attempting to use \a context on multiple threads are up to the caller to avoid. */ -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromOpenGLContext(QOpenGLContext *context) { QQuickGraphicsDevice dev; @@ -99,7 +99,7 @@ QQuickGraphicsDevice QQuickGraphicsDevice::fromOpenGLContext(QOpenGLContext *con value. \a featureLevel can be set to 0 if it is not intended to be specified, in which case the scene graph's defaults will be used. */ -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromAdapter(quint32 adapterLuidLow, qint32 adapterLuidHigh, int featureLevel) @@ -124,7 +124,7 @@ QQuickGraphicsDevice QQuickGraphicsDevice::fromAdapter(quint32 adapterLuidLow, it merely contains references. It is the caller's responsibility to ensure that the native resource exists as long as necessary. */ -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromDeviceAndContext(void *device, void *context) { QQuickGraphicsDevice dev; @@ -146,7 +146,7 @@ QQuickGraphicsDevice QQuickGraphicsDevice::fromDeviceAndContext(void *device, vo that the native resource exists as long as necessary. */ -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromDeviceAndCommandQueue(MTLDevice *device, MTLCommandQueue *commandQueue) { @@ -168,7 +168,7 @@ QQuickGraphicsDevice QQuickGraphicsDevice::fromDeviceAndCommandQueue(MTLDevice * it merely contains references. It is the caller's responsibility to ensure that the native resource exists as long as necessary. */ -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromPhysicalDevice(VkPhysicalDevice physicalDevice) { QQuickGraphicsDevice dev; @@ -190,7 +190,7 @@ QQuickGraphicsDevice QQuickGraphicsDevice::fromPhysicalDevice(VkPhysicalDevice p it merely contains references. It is the caller's responsibility to ensure that the native resource exists as long as necessary. */ -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) QQuickGraphicsDevice QQuickGraphicsDevice::fromDeviceObjects(VkPhysicalDevice physicalDevice, VkDevice device, int queueFamilyIndex, diff --git a/src/quick/items/qquickgraphicsdevice.h b/src/quick/items/qquickgraphicsdevice.h index ab5120717b..40c8020a2d 100644 --- a/src/quick/items/qquickgraphicsdevice.h +++ b/src/quick/items/qquickgraphicsdevice.h @@ -10,7 +10,7 @@ #include <QtGui/qvulkaninstance.h> #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) Q_FORWARD_DECLARE_OBJC_CLASS(MTLDevice); Q_FORWARD_DECLARE_OBJC_CLASS(MTLCommandQueue); #endif @@ -31,20 +31,20 @@ public: bool isNull() const; -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) static QQuickGraphicsDevice fromOpenGLContext(QOpenGLContext *context); #endif -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) static QQuickGraphicsDevice fromAdapter(quint32 adapterLuidLow, qint32 adapterLuidHigh, int featureLevel = 0); static QQuickGraphicsDevice fromDeviceAndContext(void *device, void *context); #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) static QQuickGraphicsDevice fromDeviceAndCommandQueue(MTLDevice *device, MTLCommandQueue *commandQueue); #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) static QQuickGraphicsDevice fromPhysicalDevice(VkPhysicalDevice physicalDevice); static QQuickGraphicsDevice fromDeviceObjects(VkPhysicalDevice physicalDevice, VkDevice device, int queueFamilyIndex, int queueIndex = 0); #endif diff --git a/src/quick/items/qquickrendertarget.cpp b/src/quick/items/qquickrendertarget.cpp index 460ce7335f..7242a55d88 100644 --- a/src/quick/items/qquickrendertarget.cpp +++ b/src/quick/items/qquickrendertarget.cpp @@ -191,7 +191,7 @@ void QQuickRenderTarget::setMirrorVertically(bool enable) \sa QQuickWindow::setRenderTarget(), QQuickRenderControl */ -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) QQuickRenderTarget QQuickRenderTarget::fromOpenGLTexture(uint textureId, uint format, const QSize &pixelSize, int sampleCount) { @@ -328,7 +328,7 @@ QQuickRenderTarget QQuickRenderTarget::fromOpenGLRenderBuffer(uint renderbufferI \sa QQuickWindow::setRenderTarget(), QQuickRenderControl */ -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QQuickRenderTarget QQuickRenderTarget::fromD3D11Texture(void *texture, uint format, const QSize &pixelSize, int sampleCount) { @@ -414,7 +414,7 @@ QQuickRenderTarget QQuickRenderTarget::fromD3D11Texture(void *texture, const QSi \sa QQuickWindow::setRenderTarget(), QQuickRenderControl */ -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) QQuickRenderTarget QQuickRenderTarget::fromMetalTexture(MTLTexture *texture, uint format, const QSize &pixelSize, int sampleCount) { @@ -501,7 +501,7 @@ QQuickRenderTarget QQuickRenderTarget::fromMetalTexture(MTLTexture *texture, con \sa QQuickWindow::setRenderTarget(), QQuickRenderControl */ -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) QQuickRenderTarget QQuickRenderTarget::fromVulkanImage(VkImage image, VkImageLayout layout, VkFormat format, const QSize &pixelSize, int sampleCount) { diff --git a/src/quick/items/qquickrendertarget.h b/src/quick/items/qquickrendertarget.h index 59ec51d7cc..ded9c80274 100644 --- a/src/quick/items/qquickrendertarget.h +++ b/src/quick/items/qquickrendertarget.h @@ -11,7 +11,7 @@ #include <QtGui/qvulkaninstance.h> #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) Q_FORWARD_DECLARE_OBJC_CLASS(MTLTexture); #endif @@ -37,23 +37,23 @@ public: bool mirrorVertically() const; void setMirrorVertically(bool enable); -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) static QQuickRenderTarget fromOpenGLTexture(uint textureId, uint format, const QSize &pixelSize, int sampleCount = 1); static QQuickRenderTarget fromOpenGLTexture(uint textureId, const QSize &pixelSize, int sampleCount = 1); static QQuickRenderTarget fromOpenGLRenderBuffer(uint renderbufferId, const QSize &pixelSize, int sampleCount = 1); #endif -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) static QQuickRenderTarget fromD3D11Texture(void *texture, uint format, const QSize &pixelSize, int sampleCount = 1); static QQuickRenderTarget fromD3D11Texture(void *texture, const QSize &pixelSize, int sampleCount = 1); #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) static QQuickRenderTarget fromMetalTexture(MTLTexture *texture, uint format, const QSize &pixelSize, int sampleCount = 1); static QQuickRenderTarget fromMetalTexture(MTLTexture *texture, const QSize &pixelSize, int sampleCount = 1); #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) static QQuickRenderTarget fromVulkanImage(VkImage image, VkImageLayout layout, VkFormat format, const QSize &pixelSize, int sampleCount = 1); static QQuickRenderTarget fromVulkanImage(VkImage image, VkImageLayout layout, const QSize &pixelSize, int sampleCount = 1); #endif diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index e3facfebe3..659d085922 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -60,7 +60,7 @@ public: // Uppermost 8 bits are reserved for internal use. IsVisitableNode = 0x01000000 -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC , InternalReserved = 0x01000000 #endif }; diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp index 15167f8ae5..a09e054078 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture.cpp +++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp @@ -679,7 +679,7 @@ QSGDynamicTexture::~QSGDynamicTexture() */ -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) namespace QNativeInterface { /*! \class QNativeInterface::QSGOpenGLTexture @@ -779,7 +779,7 @@ GLuint QSGTexturePlatformOpenGL::nativeTexture() const } #endif // opengl -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) namespace QNativeInterface { /*! \class QNativeInterface::QSGD3D11Texture @@ -839,7 +839,7 @@ void *QSGTexturePlatformD3D11::nativeTexture() const } #endif // win -#if defined(__OBJC__) || defined(Q_CLANG_QDOC) +#if defined(__OBJC__) || defined(Q_QDOC) namespace QNativeInterface { /*! \class QNativeInterface::QSGMetalTexture @@ -886,7 +886,7 @@ namespace QNativeInterface { } // QNativeInterface #endif // OBJC -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) namespace QNativeInterface { /*! \class QNativeInterface::QSGVulkanTexture diff --git a/src/quick/scenegraph/coreapi/qsgtexture_platform.h b/src/quick/scenegraph/coreapi/qsgtexture_platform.h index 42af8593bd..e8aef9078f 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture_platform.h +++ b/src/quick/scenegraph/coreapi/qsgtexture_platform.h @@ -15,7 +15,7 @@ #include <QtGui/qvulkaninstance.h> #endif -#if defined(__OBJC__) || defined(Q_CLANG_QDOC) +#if defined(__OBJC__) || defined(Q_QDOC) @protocol MTLTexture; #endif @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface { -#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(opengl) || defined(Q_QDOC) struct Q_QUICK_EXPORT QSGOpenGLTexture { QT_DECLARE_NATIVE_INTERFACE(QSGOpenGLTexture, 1, QSGTexture) @@ -39,7 +39,7 @@ struct Q_QUICK_EXPORT QSGOpenGLTexture }; #endif -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) struct Q_QUICK_EXPORT QSGD3D11Texture { QT_DECLARE_NATIVE_INTERFACE(QSGD3D11Texture, 1, QSGTexture) @@ -51,7 +51,7 @@ struct Q_QUICK_EXPORT QSGD3D11Texture }; #endif -#if defined(__OBJC__) || defined(Q_CLANG_QDOC) +#if defined(__OBJC__) || defined(Q_QDOC) struct Q_QUICK_EXPORT QSGMetalTexture { QT_DECLARE_NATIVE_INTERFACE(QSGMetalTexture, 1, QSGTexture) @@ -63,7 +63,7 @@ struct Q_QUICK_EXPORT QSGMetalTexture }; #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) struct Q_QUICK_EXPORT QSGVulkanTexture { QT_DECLARE_NATIVE_INTERFACE(QSGVulkanTexture, 1, QSGTexture) diff --git a/src/quicknativestyle/qstyle/qquickdrawutil.cpp b/src/quicknativestyle/qstyle/qquickdrawutil.cpp index 5acededc17..2bc129179f 100644 --- a/src/quicknativestyle/qstyle/qquickdrawutil.cpp +++ b/src/quicknativestyle/qstyle/qquickdrawutil.cpp @@ -878,7 +878,7 @@ typedef QVarLengthArray<QPainter::PixmapFragment, 16> QPixmapFragmentsArray; void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargins &targetMargins, const QPixmap &pixmap, const QRect &sourceRect,const QMargins &sourceMargins, const QTileRules &rules -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC , QDrawBorderPixmap::DrawingHints hints #endif ) diff --git a/src/quicknativestyle/qstyle/qquickdrawutil.h b/src/quicknativestyle/qstyle/qquickdrawutil.h index d2cc595f01..e572075114 100644 --- a/src/quicknativestyle/qstyle/qquickdrawutil.h +++ b/src/quicknativestyle/qstyle/qquickdrawutil.h @@ -85,7 +85,7 @@ struct QTileRules Qt::TileRule vertical; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC // For internal use only. namespace QDrawBorderPixmap { @@ -117,7 +117,7 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &sourceRect, const QMargins &sourceMargins, const QTileRules &rules = QTileRules() -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC , QDrawBorderPixmap::DrawingHints hints = QDrawBorderPixmap::DrawingHints() #endif ); |