Switch export macros to standard form

Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.

Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from
 src/doc/qt3d.qdocconf

Task-number: QTBUG-74752
Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

27 files changed, 28 insertions, 28 deletions

diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h
index e28535041..45492e141 100644
--- a/src/render/frontend/qabstractfunctor.h
+++ b/src/render/frontend/qabstractfunctor.h
@@ -73,7 +73,7 @@ qintptr functorTypeId()
    }
 
 
-class QT3DRENDERSHARED_EXPORT QAbstractFunctor
+class Q_3DRENDERSHARED_EXPORT QAbstractFunctor
 {
 public:
     QAbstractFunctor() = default;
diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h
index e31615741..7d717972e 100644
--- a/src/render/frontend/qcamera.h
+++ b/src/render/frontend/qcamera.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QCameraPrivate;
 
-class QT3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity
+class Q_3DRENDERSHARED_EXPORT QCamera : public Qt3DCore::QEntity
 {
     Q_OBJECT
     // CameraLens
diff --git a/src/render/frontend/qcamera_p.h b/src/render/frontend/qcamera_p.h
index 1e8464d05..00d0bfd80 100644
--- a/src/render/frontend/qcamera_p.h
+++ b/src/render/frontend/qcamera_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QCameraPrivate : public Qt3DCore::QEntityPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QCameraPrivate : public Qt3DCore::QEntityPrivate
 {
 public:
     QCameraPrivate();
diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h
index d478561ee..da7b426e1 100644
--- a/src/render/frontend/qcameralens.h
+++ b/src/render/frontend/qcameralens.h
@@ -53,7 +53,7 @@ namespace Qt3DRender {
 
 class QCameraLensPrivate;
 
-class QT3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QCameraLens : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged)
diff --git a/src/render/frontend/qcameralens_p.h b/src/render/frontend/qcameralens_p.h
index 0ec197945..111ab6522 100644
--- a/src/render/frontend/qcameralens_p.h
+++ b/src/render/frontend/qcameralens_p.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QCameraLensPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QCameraLensPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QCameraLensPrivate();
diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h
index f0c251a9b..b71007ba0 100644
--- a/src/render/frontend/qcomputecommand.h
+++ b/src/render/frontend/qcomputecommand.h
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 
 class QComputeCommandPrivate;
 
-class QT3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QComputeCommand : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(int workGroupX READ workGroupX WRITE setWorkGroupX NOTIFY workGroupXChanged)
diff --git a/src/render/frontend/qcomputecommand_p.h b/src/render/frontend/qcomputecommand_p.h
index fc3376d5b..0a614325b 100644
--- a/src/render/frontend/qcomputecommand_p.h
+++ b/src/render/frontend/qcomputecommand_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QComputeCommandPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QComputeCommandPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QComputeCommandPrivate();
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index 27910f190..4900f30e0 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
 
 class QLayerPrivate;
 
-class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h
index 1c01955f7..3a1fd7f61 100644
--- a/src/render/frontend/qlayer_p.h
+++ b/src/render/frontend/qlayer_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLayerPrivate();
diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h
index fb74659dd..308a4d3c0 100644
--- a/src/render/frontend/qlevelofdetail.h
+++ b/src/render/frontend/qlevelofdetail.h
@@ -53,7 +53,7 @@ namespace Qt3DRender {
 class QCamera;
 class QLevelOfDetailPrivate;
 
-class QT3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
diff --git a/src/render/frontend/qlevelofdetail_p.h b/src/render/frontend/qlevelofdetail_p.h
index 136d2ffa3..7b409e4ca 100644
--- a/src/render/frontend/qlevelofdetail_p.h
+++ b/src/render/frontend/qlevelofdetail_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QLevelOfDetailPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QLevelOfDetailPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLevelOfDetailPrivate();
diff --git a/src/render/frontend/qlevelofdetailboundingsphere.h b/src/render/frontend/qlevelofdetailboundingsphere.h
index 43ba422a8..81d49d04e 100644
--- a/src/render/frontend/qlevelofdetailboundingsphere.h
+++ b/src/render/frontend/qlevelofdetailboundingsphere.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
 
 class QLevelOfDetailBoundingSpherePrivate;
 
-class QT3DRENDERSHARED_EXPORT QLevelOfDetailBoundingSphere
+class Q_3DRENDERSHARED_EXPORT QLevelOfDetailBoundingSphere
 {
     Q_GADGET
     Q_PROPERTY(QVector3D center READ center CONSTANT)
diff --git a/src/render/frontend/qlevelofdetailswitch.h b/src/render/frontend/qlevelofdetailswitch.h
index 55c7d24c1..1615d16e6 100644
--- a/src/render/frontend/qlevelofdetailswitch.h
+++ b/src/render/frontend/qlevelofdetailswitch.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_EXPORT QLevelOfDetailSwitch : public QLevelOfDetail
+class Q_3DRENDERSHARED_EXPORT QLevelOfDetailSwitch : public QLevelOfDetail
 {
     Q_OBJECT
 
diff --git a/src/render/frontend/qpickingsettings.h b/src/render/frontend/qpickingsettings.h
index 741f918b0..11384414b 100644
--- a/src/render/frontend/qpickingsettings.h
+++ b/src/render/frontend/qpickingsettings.h
@@ -51,7 +51,7 @@ class QPickingSettingsPrivate;
 
 // TO DO: Qt 6 -> Make this a QObject
 
-class QT3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QPickingSettings : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(PickMethod pickMethod READ pickMethod WRITE setPickMethod NOTIFY pickMethodChanged)
diff --git a/src/render/frontend/qpickingsettings_p.h b/src/render/frontend/qpickingsettings_p.h
index 780a8b677..73f48c06e 100644
--- a/src/render/frontend/qpickingsettings_p.h
+++ b/src/render/frontend/qpickingsettings_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QPickingSettingsPrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QPickingSettingsPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QPickingSettingsPrivate();
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index bde60c9e2..5571988a7 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -65,7 +65,7 @@ class QRenderAspectPrivate;
 class QRenderAspectTester;
 #endif
 
-class QT3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
+class Q_3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h
index 26ca091f6..4a091e164 100644
--- a/src/render/frontend/qrenderaspect_p.h
+++ b/src/render/frontend/qrenderaspect_p.h
@@ -75,7 +75,7 @@ namespace Render {
 class OffscreenSurfaceHelper;
 }
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
 public:
     QRenderAspectPrivate(QRenderAspect::RenderType type);
diff --git a/src/render/frontend/qrenderplugin_p.h b/src/render/frontend/qrenderplugin_p.h
index 5144448c1..c34dabefc 100644
--- a/src/render/frontend/qrenderplugin_p.h
+++ b/src/render/frontend/qrenderplugin_p.h
@@ -64,7 +64,7 @@ namespace Render {
 
 class AbstractRenderer;
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPlugin
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPlugin
 {
 public:
     virtual bool registerBackendTypes(QRenderAspect *aspect, AbstractRenderer *renderer) = 0;
diff --git a/src/render/frontend/qrenderpluginfactory_p.h b/src/render/frontend/qrenderpluginfactory_p.h
index 9cffd500a..26e856613 100644
--- a/src/render/frontend/qrenderpluginfactory_p.h
+++ b/src/render/frontend/qrenderpluginfactory_p.h
@@ -59,7 +59,7 @@ namespace Render {
 
 class QRenderPlugin;
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactory
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactory
 {
 public:
     static QStringList keys(const QString &pluginPath = QString());
diff --git a/src/render/frontend/qrenderpluginfactoryif_p.h b/src/render/frontend/qrenderpluginfactoryif_p.h
index d5f0008d2..249552b32 100644
--- a/src/render/frontend/qrenderpluginfactoryif_p.h
+++ b/src/render/frontend/qrenderpluginfactoryif_p.h
@@ -64,7 +64,7 @@ namespace Render {
 
 class QRenderPlugin;
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactoryIf : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactoryIf : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h
index b759ebd88..9d2baa58b 100644
--- a/src/render/frontend/qrendersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
 class QFrameGraphNode;
 class QRenderSettingsPrivate;
 
-class QT3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QRenderSettings : public Qt3DCore::QComponent
 {
     Q_OBJECT
 
diff --git a/src/render/frontend/qrendersettings_p.h b/src/render/frontend/qrendersettings_p.h
index 60ebd0f0d..f91397bd2 100644
--- a/src/render/frontend/qrendersettings_p.h
+++ b/src/render/frontend/qrendersettings_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderSettingsPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderSettingsPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QRenderSettingsPrivate();
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index 69bed5aa5..9faf113da 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
 class QRenderTargetPrivate;
 class QRenderTargetOutput;
 
-class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index f1035e846..b08477478 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
 class QRenderTargetOutput;
 class QRenderTarget;
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QRenderTargetPrivate();
diff --git a/src/render/frontend/qrendertargetoutput.h b/src/render/frontend/qrendertargetoutput.h
index 2eb99df3c..a582c26f0 100644
--- a/src/render/frontend/qrendertargetoutput.h
+++ b/src/render/frontend/qrendertargetoutput.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
 class QAbstractTexture;
 class QRenderTargetOutputPrivate;
 
-class QT3DRENDERSHARED_EXPORT QRenderTargetOutput : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QRenderTargetOutput : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(AttachmentPoint attachmentPoint READ attachmentPoint WRITE setAttachmentPoint NOTIFY attachmentPointChanged)
diff --git a/src/render/frontend/qrendertargetoutput_p.h b/src/render/frontend/qrendertargetoutput_p.h
index df855f184..e16a5eeb0 100644
--- a/src/render/frontend/qrendertargetoutput_p.h
+++ b/src/render/frontend/qrendertargetoutput_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
 
 class QAbstractTexture;
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetOutputPrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderTargetOutputPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QRenderTargetOutputPrivate();
diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h
index 14b6f1414..10cf92091 100644
--- a/src/render/frontend/sphere_p.h
+++ b/src/render/frontend/sphere_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class QT3DRENDERSHARED_PRIVATE_EXPORT Sphere : public RayCasting::BoundingSphere
+class Q_3DRENDERSHARED_PRIVATE_EXPORT Sphere : public RayCasting::BoundingSphere
 {
 public:
     inline Sphere(Qt3DCore::QNodeId i = Qt3DCore::QNodeId())
@@ -158,7 +158,7 @@ inline bool intersects(const Sphere &a, const Sphere &b)
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QT3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const Sphere &sphere);
+Q_3DRENDERSHARED_EXPORT QDebug operator<<(QDebug dbg, const Sphere &sphere);
 #endif
 
 } // Render