summaryrefslogtreecommitdiffstats
path: root/src/render/texture
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/texture
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/texture')
-rw-r--r--src/render/texture/qabstracttexture.h2
-rw-r--r--src/render/texture/qabstracttexture_p.h2
-rw-r--r--src/render/texture/qabstracttextureimage.h2
-rw-r--r--src/render/texture/qabstracttextureimage_p.h2
-rw-r--r--src/render/texture/qpaintedtextureimage.h2
-rw-r--r--src/render/texture/qpaintedtextureimage_p.h2
-rw-r--r--src/render/texture/qtexture.h26
-rw-r--r--src/render/texture/qtexture_p.h2
-rw-r--r--src/render/texture/qtexturedata.h2
-rw-r--r--src/render/texture/qtexturegenerator.h2
-rw-r--r--src/render/texture/qtextureimage.h2
-rw-r--r--src/render/texture/qtextureimage_p.h2
-rw-r--r--src/render/texture/qtextureimagedata.h2
-rw-r--r--src/render/texture/qtextureimagedatagenerator.h2
-rw-r--r--src/render/texture/qtexturewrapmode.h2
15 files changed, 27 insertions, 27 deletions
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index 40953f253..6097e4449 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -55,7 +55,7 @@ class QTextureGenerator;
typedef QSharedPointer<QTextureGenerator> QTextureGeneratorPtr;
-class QT3DRENDERSHARED_EXPORT QAbstractTexture : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QAbstractTexture : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(Target target READ target CONSTANT)
diff --git a/src/render/texture/qabstracttexture_p.h b/src/render/texture/qabstracttexture_p.h
index 0ad1d0737..f4bdecacc 100644
--- a/src/render/texture/qabstracttexture_p.h
+++ b/src/render/texture/qabstracttexture_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTexturePrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractTexturePrivate : public Qt3DCore::QNodePrivate
{
public :
QAbstractTexturePrivate();
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index 7e840fdd4..e072a26dc 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -49,7 +49,7 @@ namespace Qt3DRender {
class QAbstractTextureImagePrivate;
-class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
+class Q_3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
{
Q_OBJECT
Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged)
diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index f0d836055..a5299acd7 100644
--- a/src/render/texture/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
class QAbstractTextureImage;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
{
public:
QAbstractTextureImagePrivate();
diff --git a/src/render/texture/qpaintedtextureimage.h b/src/render/texture/qpaintedtextureimage.h
index 5b884a42e..1e8cf90ae 100644
--- a/src/render/texture/qpaintedtextureimage.h
+++ b/src/render/texture/qpaintedtextureimage.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
class QPaintedTextureImagePrivate;
-class QT3DRENDERSHARED_EXPORT QPaintedTextureImage : public QAbstractTextureImage
+class Q_3DRENDERSHARED_EXPORT QPaintedTextureImage : public QAbstractTextureImage
{
Q_OBJECT
Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
diff --git a/src/render/texture/qpaintedtextureimage_p.h b/src/render/texture/qpaintedtextureimage_p.h
index 4e554f1c1..48553323d 100644
--- a/src/render/texture/qpaintedtextureimage_p.h
+++ b/src/render/texture/qpaintedtextureimage_p.h
@@ -63,7 +63,7 @@ class QPainter;
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QPaintedTextureImagePrivate : public QAbstractTextureImagePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QPaintedTextureImagePrivate : public QAbstractTextureImagePrivate
{
public:
QPaintedTextureImagePrivate();
diff --git a/src/render/texture/qtexture.h b/src/render/texture/qtexture.h
index 991725de2..7556c6fc4 100644
--- a/src/render/texture/qtexture.h
+++ b/src/render/texture/qtexture.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTexture
{
Q_OBJECT
public:
@@ -63,7 +63,7 @@ public:
~QTexture1D();
};
-class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTexture
{
Q_OBJECT
public:
@@ -71,7 +71,7 @@ public:
~QTexture1DArray();
};
-class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTexture
{
Q_OBJECT
public:
@@ -79,7 +79,7 @@ public:
~QTexture2D();
};
-class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTexture
{
Q_OBJECT
public:
@@ -87,7 +87,7 @@ public:
~QTexture2DArray();
};
-class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTexture
{
Q_OBJECT
public:
@@ -95,7 +95,7 @@ public:
~QTexture3D();
};
-class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTexture
{
Q_OBJECT
public:
@@ -103,7 +103,7 @@ public:
~QTextureCubeMap();
};
-class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexture
{
Q_OBJECT
public:
@@ -111,7 +111,7 @@ public:
~QTextureCubeMapArray();
};
-class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTexture
{
Q_OBJECT
public:
@@ -119,7 +119,7 @@ public:
~QTexture2DMultisample();
};
-class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTexture
{
Q_OBJECT
public:
@@ -127,7 +127,7 @@ public:
~QTexture2DMultisampleArray();
};
-class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTexture
{
Q_OBJECT
public:
@@ -135,7 +135,7 @@ public:
~QTextureRectangle();
};
-class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTexture
{
Q_OBJECT
public:
@@ -145,7 +145,7 @@ public:
class QTextureLoaderPrivate;
-class QT3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QTextureLoader : public QAbstractTexture
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -169,7 +169,7 @@ private:
Q_DECLARE_PRIVATE(QTextureLoader)
};
-class QT3DRENDERSHARED_EXPORT QSharedGLTexture : public QAbstractTexture
+class Q_3DRENDERSHARED_EXPORT QSharedGLTexture : public QAbstractTexture
{
Q_OBJECT
Q_PROPERTY(int textureId READ textureId WRITE setTextureId NOTIFY textureIdChanged)
diff --git a/src/render/texture/qtexture_p.h b/src/render/texture/qtexture_p.h
index 087480340..012b719ff 100644
--- a/src/render/texture/qtexture_p.h
+++ b/src/render/texture/qtexture_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QTextureLoaderPrivate : public QAbstractTexturePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QTextureLoaderPrivate : public QAbstractTexturePrivate
{
public:
QTextureLoaderPrivate();
diff --git a/src/render/texture/qtexturedata.h b/src/render/texture/qtexturedata.h
index a86a3ec45..04324ca14 100644
--- a/src/render/texture/qtexturedata.h
+++ b/src/render/texture/qtexturedata.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
class QTextureDataPrivate;
-class QT3DRENDERSHARED_EXPORT QTextureData
+class Q_3DRENDERSHARED_EXPORT QTextureData
{
public:
QTextureData();
diff --git a/src/render/texture/qtexturegenerator.h b/src/render/texture/qtexturegenerator.h
index 10f0cde57..7ae3d3a84 100644
--- a/src/render/texture/qtexturegenerator.h
+++ b/src/render/texture/qtexturegenerator.h
@@ -52,7 +52,7 @@ namespace Qt3DRender {
class QTextureData;
typedef QSharedPointer<QTextureData> QTextureDataPtr;
-class QT3DRENDERSHARED_EXPORT QTextureGenerator : public QAbstractFunctor
+class Q_3DRENDERSHARED_EXPORT QTextureGenerator : public QAbstractFunctor
{
public:
virtual ~QTextureGenerator();
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index d3fccde70..7d08c8e6e 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -49,7 +49,7 @@ namespace Qt3DRender {
class QTextureImagePrivate;
-class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
+class Q_3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/texture/qtextureimage_p.h b/src/render/texture/qtextureimage_p.h
index 5a4ea8f5a..3cb704cf8 100644
--- a/src/render/texture/qtextureimage_p.h
+++ b/src/render/texture/qtextureimage_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_PRIVATE_EXPORT QTextureImagePrivate : public QAbstractTextureImagePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QTextureImagePrivate : public QAbstractTextureImagePrivate
{
public:
QTextureImagePrivate()
diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h
index 6d66f2390..68ceebabc 100644
--- a/src/render/texture/qtextureimagedata.h
+++ b/src/render/texture/qtextureimagedata.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
class QTextureImageDataPrivate;
-class QT3DRENDERSHARED_EXPORT QTextureImageData
+class Q_3DRENDERSHARED_EXPORT QTextureImageData
{
public:
QTextureImageData();
diff --git a/src/render/texture/qtextureimagedatagenerator.h b/src/render/texture/qtextureimagedatagenerator.h
index 0e7e6c782..7c58b3878 100644
--- a/src/render/texture/qtextureimagedatagenerator.h
+++ b/src/render/texture/qtextureimagedatagenerator.h
@@ -55,7 +55,7 @@ namespace Qt3DRender {
class QTextureImageData;
typedef QSharedPointer<QTextureImageData> QTextureImageDataPtr;
-class QT3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor
+class Q_3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor
{
public:
virtual ~QTextureImageDataGenerator() {}
diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h
index 36af013a8..b31ccc17b 100644
--- a/src/render/texture/qtexturewrapmode.h
+++ b/src/render/texture/qtexturewrapmode.h
@@ -49,7 +49,7 @@ namespace Qt3DRender {
class QTextureWrapModePrivate;
-class QT3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject
+class Q_3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject
{
Q_OBJECT
Q_PROPERTY(WrapMode x READ x WRITE setX NOTIFY xChanged)