summaryrefslogtreecommitdiffstats
path: root/src/render/lights
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/lights
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/lights')
-rw-r--r--src/render/lights/qabstractlight.h2
-rw-r--r--src/render/lights/qabstractlight_p.h2
-rw-r--r--src/render/lights/qdirectionallight.h2
-rw-r--r--src/render/lights/qdirectionallight_p.h2
-rw-r--r--src/render/lights/qenvironmentlight.h2
-rw-r--r--src/render/lights/qenvironmentlight_p.h2
-rw-r--r--src/render/lights/qpointlight.h2
-rw-r--r--src/render/lights/qpointlight_p.h2
-rw-r--r--src/render/lights/qspotlight.h2
-rw-r--r--src/render/lights/qspotlight_p.h2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index b5dd89222..e92a5ee1d 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -52,7 +52,7 @@ namespace Qt3DRender {
class QAbstractLightPrivate;
-class QT3DRENDERSHARED_EXPORT QAbstractLight : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QAbstractLight : public Qt3DCore::QComponent
{
Q_OBJECT
Q_PROPERTY(Type type READ type)
diff --git a/src/render/lights/qabstractlight_p.h b/src/render/lights/qabstractlight_p.h
index f7831dce2..ebb8092b4 100644
--- a/src/render/lights/qabstractlight_p.h
+++ b/src/render/lights/qabstractlight_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
class QAbstractLight;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QAbstractLightPrivate : public Qt3DCore::QComponentPrivate
{
public:
explicit QAbstractLightPrivate(QAbstractLight::Type type);
diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h
index 6be1585db..5d572b9ea 100644
--- a/src/render/lights/qdirectionallight.h
+++ b/src/render/lights/qdirectionallight.h
@@ -48,7 +48,7 @@ namespace Qt3DRender {
class QDirectionalLightPrivate;
-class QT3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight
+class Q_3DRENDERSHARED_EXPORT QDirectionalLight : public QAbstractLight
{
Q_OBJECT
Q_PROPERTY(QVector3D worldDirection READ worldDirection WRITE setWorldDirection NOTIFY worldDirectionChanged)
diff --git a/src/render/lights/qdirectionallight_p.h b/src/render/lights/qdirectionallight_p.h
index ea80913eb..d57a95604 100644
--- a/src/render/lights/qdirectionallight_p.h
+++ b/src/render/lights/qdirectionallight_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
class QDirectionalLight;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate
{
public:
QDirectionalLightPrivate();
diff --git a/src/render/lights/qenvironmentlight.h b/src/render/lights/qenvironmentlight.h
index 995768d3c..3afc44f28 100644
--- a/src/render/lights/qenvironmentlight.h
+++ b/src/render/lights/qenvironmentlight.h
@@ -50,7 +50,7 @@ namespace Qt3DRender {
class QAbstractTexture;
class QEnvironmentLightPrivate;
-class QT3DRENDERSHARED_EXPORT QEnvironmentLight : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QEnvironmentLight : public Qt3DCore::QComponent
{
Q_OBJECT
Q_PROPERTY(Qt3DRender::QAbstractTexture *irradiance READ irradiance WRITE setIrradiance NOTIFY irradianceChanged)
diff --git a/src/render/lights/qenvironmentlight_p.h b/src/render/lights/qenvironmentlight_p.h
index f4fa97b5a..a512f8f5b 100644
--- a/src/render/lights/qenvironmentlight_p.h
+++ b/src/render/lights/qenvironmentlight_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
class QAbstractTexture;
class QEnvironmentLight;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QEnvironmentLightPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QEnvironmentLightPrivate : public Qt3DCore::QComponentPrivate
{
public:
explicit QEnvironmentLightPrivate();
diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h
index 16e048560..1efe1679a 100644
--- a/src/render/lights/qpointlight.h
+++ b/src/render/lights/qpointlight.h
@@ -48,7 +48,7 @@ namespace Qt3DRender {
class QPointLightPrivate;
-class QT3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight
+class Q_3DRENDERSHARED_EXPORT QPointLight : public QAbstractLight
{
Q_OBJECT
Q_PROPERTY(float constantAttenuation READ constantAttenuation WRITE setConstantAttenuation NOTIFY constantAttenuationChanged)
diff --git a/src/render/lights/qpointlight_p.h b/src/render/lights/qpointlight_p.h
index 147867667..64c971291 100644
--- a/src/render/lights/qpointlight_p.h
+++ b/src/render/lights/qpointlight_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
class QPointLight;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QPointLightPrivate : public QAbstractLightPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QPointLightPrivate : public QAbstractLightPrivate
{
public:
QPointLightPrivate();
diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h
index 8902708a3..760508b79 100644
--- a/src/render/lights/qspotlight.h
+++ b/src/render/lights/qspotlight.h
@@ -48,7 +48,7 @@ namespace Qt3DRender {
class QSpotLightPrivate;
-class QT3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight
+class Q_3DRENDERSHARED_EXPORT QSpotLight : public QAbstractLight
{
Q_OBJECT
Q_PROPERTY(float constantAttenuation READ constantAttenuation WRITE setConstantAttenuation NOTIFY constantAttenuationChanged)
diff --git a/src/render/lights/qspotlight_p.h b/src/render/lights/qspotlight_p.h
index eabc00353..2646a72cd 100644
--- a/src/render/lights/qspotlight_p.h
+++ b/src/render/lights/qspotlight_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
class QSpotLight;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSpotLightPrivate : public QAbstractLightPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSpotLightPrivate : public QAbstractLightPrivate
{
public:
QSpotLightPrivate();