summaryrefslogtreecommitdiffstats
path: root/src/render/geometry
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-04-01 09:35:50 +0200
committerKai Koehne <kai.koehne@qt.io>2019-04-02 14:00:58 +0000
commit7b096b1de9691ddef8445102cc9f71b90aa31cee (patch)
tree654d36883afaca4d610b3c9a4e8990a7e4e41721 /src/render/geometry
parentf3259300bde381b10cb737735fe19b039c969782 (diff)
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>
Diffstat (limited to 'src/render/geometry')
-rw-r--r--src/render/geometry/qattribute.h2
-rw-r--r--src/render/geometry/qattribute_p.h2
-rw-r--r--src/render/geometry/qbuffer.h2
-rw-r--r--src/render/geometry/qbuffer_p.h2
-rw-r--r--src/render/geometry/qbufferdatagenerator.h2
-rw-r--r--src/render/geometry/qgeometry.h2
-rw-r--r--src/render/geometry/qgeometry_p.h2
-rw-r--r--src/render/geometry/qgeometryfactory.h2
-rw-r--r--src/render/geometry/qgeometryrenderer.h2
-rw-r--r--src/render/geometry/qgeometryrenderer_p.h2
-rw-r--r--src/render/geometry/qmesh.h2
-rw-r--r--src/render/geometry/qmesh_p.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 13a0319b5..526a77a59 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -53,7 +53,7 @@ class QAttributePrivate;
typedef QSharedPointer<QBuffer> QBufferPtr;
-class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(Qt3DRender::QBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h
index d3385345a..8355a042b 100644
--- a/src/render/geometry/qattribute_p.h
+++ b/src/render/geometry/qattribute_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
class QAttribute;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QAttributePrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QAttributePrivate : public Qt3DCore::QNodePrivate
{
public:
Q_DECLARE_PUBLIC(QAttribute)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index f04c98a11..1bd1aa8fd 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -53,7 +53,7 @@ class QBufferPrivate;
class QBufferDataGenerator;
typedef QSharedPointer<QBufferDataGenerator> QBufferDataGeneratorPtr;
-class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index a342518e0..7a0ffdfb9 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QNodePrivate
{
public:
Q_DECLARE_PUBLIC(QBuffer)
diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h
index 004eb26eb..aea6eaef5 100644
--- a/src/render/geometry/qbufferdatagenerator.h
+++ b/src/render/geometry/qbufferdatagenerator.h
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_EXPORT QBufferDataGenerator : public QAbstractFunctor
+class Q_3DRENDERSHARED_EXPORT QBufferDataGenerator : public QAbstractFunctor
{
public:
virtual ~QBufferDataGenerator() {}
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 6f9f5511f..cae637f1f 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
class QAttribute;
class QGeometryPrivate;
-class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged)
diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h
index f53548e43..94f71d780 100644
--- a/src/render/geometry/qgeometry_p.h
+++ b/src/render/geometry/qgeometry_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryPrivate : public Qt3DCore::QNodePrivate
{
public:
Q_DECLARE_PUBLIC(QGeometry)
diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h
index 2e4d5c821..92acbc67d 100644
--- a/src/render/geometry/qgeometryfactory.h
+++ b/src/render/geometry/qgeometryfactory.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
class QGeometry;
-class QT3DRENDERSHARED_EXPORT QGeometryFactory : public QAbstractFunctor
+class Q_3DRENDERSHARED_EXPORT QGeometryFactory : public QAbstractFunctor
{
public:
virtual ~QGeometryFactory();
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 85bab9fc6..81bd1ff67 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -53,7 +53,7 @@ class QGeometryFactory;
typedef QSharedPointer<QGeometryFactory> QGeometryFactoryPtr;
-class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
{
Q_OBJECT
Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged)
diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index 8096b4a6b..32ca334e3 100644
--- a/src/render/geometry/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate
{
public:
QGeometryRendererPrivate();
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index a7b2747f7..458a21fa4 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -54,7 +54,7 @@ class QMeshPrivate;
* @brief Simple static mesh
*
*/
-class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
+class Q_3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h
index 2d03e7862..4a4ff4979 100644
--- a/src/render/geometry/qmesh_p.h
+++ b/src/render/geometry/qmesh_p.h
@@ -69,7 +69,7 @@ namespace Render {
class NodeManagers;
}
-class QT3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate
{
public:
QMeshPrivate();