From 9dd45fff835a7c261dacc9ee6239d42ef1a74bbe Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 23 Nov 2023 10:48:30 +0100 Subject: Remove the use of Q_QUICK_PRIVATE_EXPORT Task-number: QTBUG-117983 Change-Id: Ia904c9390efb13b92de2e16fa0690e48394f9bab Reviewed-by: Mitch Curtis --- src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h | 2 +- src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h | 2 +- src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 +- src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h | 2 +- src/quick/scenegraph/coreapi/qsgmaterialshader_p.h | 2 +- src/quick/scenegraph/coreapi/qsgnodeupdater_p.h | 2 +- src/quick/scenegraph/coreapi/qsgrenderer_p.h | 10 +++++----- src/quick/scenegraph/coreapi/qsgrendernode_p.h | 2 +- src/quick/scenegraph/coreapi/qsgtexture_p.h | 14 +++++++------- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/quick/scenegraph/coreapi') diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h index 3459ee1e82..971e6dc023 100644 --- a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE class QSGAbstractRendererPrivate; -class Q_QUICK_PRIVATE_EXPORT QSGAbstractRenderer : public QObject +class Q_QUICK_EXPORT QSGAbstractRenderer : public QObject { Q_OBJECT public: diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h index 92ec284878..5f8e70f407 100644 --- a/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h +++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer_p_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QSGAbstractRendererPrivate : public QObjectPrivate +class Q_QUICK_EXPORT QSGAbstractRendererPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QSGAbstractRenderer) public: diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 1d4f9ac486..6e9824a709 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG -Q_QUICK_PRIVATE_EXPORT bool qsg_test_and_clear_material_failure(); +Q_QUICK_EXPORT bool qsg_test_and_clear_material_failure(); #endif int qt_sg_envInt(const char *name, int defaultValue); diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h index 8f7964b21d..f50ba8654e 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h @@ -723,7 +723,7 @@ protected: QHash m_visualizeChangeSet; }; -class Q_QUICK_PRIVATE_EXPORT Renderer : public QSGRenderer +class Q_QUICK_EXPORT Renderer : public QSGRenderer { public: Renderer(QSGDefaultRenderContext *ctx, QSGRendererInterface::RenderMode renderMode = QSGRendererInterface::RenderMode2D); diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h index 1eebb9a6ed..8b4a4c0b2f 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h +++ b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QRhiSampler; -class Q_QUICK_PRIVATE_EXPORT QSGMaterialShaderPrivate +class Q_QUICK_EXPORT QSGMaterialShaderPrivate { public: Q_DECLARE_PUBLIC(QSGMaterialShader) diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index 6babf76395..a2bf37b538 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -28,7 +28,7 @@ class QSGGeometryNode; class QMatrix4x4; class QSGRenderNode; -class Q_QUICK_PRIVATE_EXPORT QSGNodeUpdater +class Q_QUICK_EXPORT QSGNodeUpdater { public: QSGNodeUpdater(); diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h index eedc5a3195..eadba0ca7e 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -29,10 +29,10 @@ class QRhiCommandBuffer; class QRhiRenderPassDescriptor; class QRhiResourceUpdateBatch; -Q_QUICK_PRIVATE_EXPORT bool qsg_test_and_clear_fatal_render_error(); -Q_QUICK_PRIVATE_EXPORT void qsg_set_fatal_renderer_error(); +Q_QUICK_EXPORT bool qsg_test_and_clear_fatal_render_error(); +Q_QUICK_EXPORT void qsg_set_fatal_renderer_error(); -class Q_QUICK_PRIVATE_EXPORT QSGRenderTarget +class Q_QUICK_EXPORT QSGRenderTarget { public: QSGRenderTarget() { } @@ -55,7 +55,7 @@ public: QPaintDevice *paintDevice = nullptr; }; -class Q_QUICK_PRIVATE_EXPORT QSGRenderer : public QSGAbstractRenderer +class Q_QUICK_EXPORT QSGRenderer : public QSGAbstractRenderer { public: QSGRenderer(QSGRenderContext *context); @@ -154,7 +154,7 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState } -class Q_QUICK_PRIVATE_EXPORT QSGNodeDumper : public QSGNodeVisitor { +class Q_QUICK_EXPORT QSGNodeDumper : public QSGNodeVisitor { public: static void dump(QSGNode *n); diff --git a/src/quick/scenegraph/coreapi/qsgrendernode_p.h b/src/quick/scenegraph/coreapi/qsgrendernode_p.h index 680c0d219b..198626f03c 100644 --- a/src/quick/scenegraph/coreapi/qsgrendernode_p.h +++ b/src/quick/scenegraph/coreapi/qsgrendernode_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK_PRIVATE_EXPORT QSGRenderNodePrivate +class Q_QUICK_EXPORT QSGRenderNodePrivate { public: QSGRenderNodePrivate(); diff --git a/src/quick/scenegraph/coreapi/qsgtexture_p.h b/src/quick/scenegraph/coreapi/qsgtexture_p.h index ef37216e1e..90356ee739 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture_p.h +++ b/src/quick/scenegraph/coreapi/qsgtexture_p.h @@ -39,7 +39,7 @@ bool operator!=(const QSGSamplerDescription &a, const QSGSamplerDescription &b) size_t qHash(const QSGSamplerDescription &s, size_t seed = 0) noexcept; #if QT_CONFIG(opengl) -class Q_QUICK_PRIVATE_EXPORT QSGTexturePlatformOpenGL : public QNativeInterface::QSGOpenGLTexture +class Q_QUICK_EXPORT QSGTexturePlatformOpenGL : public QNativeInterface::QSGOpenGLTexture { public: QSGTexturePlatformOpenGL(QSGTexture *t) : m_texture(t) { } @@ -50,7 +50,7 @@ public: #endif #ifdef Q_OS_WIN -class Q_QUICK_PRIVATE_EXPORT QSGTexturePlatformD3D11 : public QNativeInterface::QSGD3D11Texture +class Q_QUICK_EXPORT QSGTexturePlatformD3D11 : public QNativeInterface::QSGD3D11Texture { public: QSGTexturePlatformD3D11(QSGTexture *t) : m_texture(t) { } @@ -58,7 +58,7 @@ public: void *nativeTexture() const override; }; -class Q_QUICK_PRIVATE_EXPORT QSGTexturePlatformD3D12 : public QNativeInterface::QSGD3D12Texture +class Q_QUICK_EXPORT QSGTexturePlatformD3D12 : public QNativeInterface::QSGD3D12Texture { public: QSGTexturePlatformD3D12(QSGTexture *t) : m_texture(t) { } @@ -70,7 +70,7 @@ public: #endif #if defined(__OBJC__) -class Q_QUICK_PRIVATE_EXPORT QSGTexturePlatformMetal : public QNativeInterface::QSGMetalTexture +class Q_QUICK_EXPORT QSGTexturePlatformMetal : public QNativeInterface::QSGMetalTexture { public: QSGTexturePlatformMetal(QSGTexture *t) : m_texture(t) { } @@ -81,7 +81,7 @@ public: #endif #if QT_CONFIG(vulkan) -class Q_QUICK_PRIVATE_EXPORT QSGTexturePlatformVulkan : public QNativeInterface::QSGVulkanTexture +class Q_QUICK_EXPORT QSGTexturePlatformVulkan : public QNativeInterface::QSGVulkanTexture { public: QSGTexturePlatformVulkan(QSGTexture *t) : m_texture(t) { } @@ -92,7 +92,7 @@ public: }; #endif -class Q_QUICK_PRIVATE_EXPORT QSGTexturePrivate : public QObjectPrivate +class Q_QUICK_EXPORT QSGTexturePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QSGTexture) public: @@ -129,7 +129,7 @@ public: #endif }; -Q_QUICK_PRIVATE_EXPORT bool qsg_safeguard_texture(QSGTexture *); +Q_QUICK_EXPORT bool qsg_safeguard_texture(QSGTexture *); QT_END_NAMESPACE -- cgit v1.2.3