summaryrefslogtreecommitdiffstats
path: root/src/render/io
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/io
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/io')
-rw-r--r--src/render/io/qaxisalignedboundingbox_p.h2
-rw-r--r--src/render/io/qgeometryloaderfactory_p.h2
-rw-r--r--src/render/io/qgeometryloaderinterface_p.h2
-rw-r--r--src/render/io/qsceneexporter_p.h2
-rw-r--r--src/render/io/qsceneexportfactory_p.h2
-rw-r--r--src/render/io/qsceneexportplugin_p.h2
-rw-r--r--src/render/io/qsceneimporter_p.h2
-rw-r--r--src/render/io/qsceneimportfactory_p.h2
-rw-r--r--src/render/io/qsceneimportplugin_p.h2
-rw-r--r--src/render/io/qsceneloader.h2
-rw-r--r--src/render/io/qsceneloader_p.h2
-rw-r--r--src/render/io/qurlhelper_p.h2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/render/io/qaxisalignedboundingbox_p.h b/src/render/io/qaxisalignedboundingbox_p.h
index 7a88190b7..c77fa1147 100644
--- a/src/render/io/qaxisalignedboundingbox_p.h
+++ b/src/render/io/qaxisalignedboundingbox_p.h
@@ -86,7 +86,7 @@ public:
bool isNull() const { return m_center.isNull() && m_radii.isNull(); }
- void QT3DRENDERSHARED_PRIVATE_EXPORT update(const QVector<QVector3D> &points);
+ void Q_3DRENDERSHARED_PRIVATE_EXPORT update(const QVector<QVector3D> &points);
inline QVector3D center() const { return m_center; }
inline QVector3D radii() const { return m_radii; }
diff --git a/src/render/io/qgeometryloaderfactory_p.h b/src/render/io/qgeometryloaderfactory_p.h
index 6e0044c4a..b4f2be2b5 100644
--- a/src/render/io/qgeometryloaderfactory_p.h
+++ b/src/render/io/qgeometryloaderfactory_p.h
@@ -65,7 +65,7 @@ namespace Qt3DRender {
class QGeometryLoaderInterface;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderFactory : public QObject, public QFactoryInterface
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderFactory : public QObject, public QFactoryInterface
{
Q_OBJECT
Q_INTERFACES(QFactoryInterface)
diff --git a/src/render/io/qgeometryloaderinterface_p.h b/src/render/io/qgeometryloaderinterface_p.h
index 22d4f8bea..36928445f 100644
--- a/src/render/io/qgeometryloaderinterface_p.h
+++ b/src/render/io/qgeometryloaderinterface_p.h
@@ -63,7 +63,7 @@ namespace Qt3DRender {
class QGeometry;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderInterface : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QGeometryLoaderInterface : public QObject
{
public:
virtual QGeometry *geometry() const = 0;
diff --git a/src/render/io/qsceneexporter_p.h b/src/render/io/qsceneexporter_p.h
index 3c8b92c77..7b92a0ff3 100644
--- a/src/render/io/qsceneexporter_p.h
+++ b/src/render/io/qsceneexporter_p.h
@@ -67,7 +67,7 @@ namespace Qt3DRender {
Q_DECLARE_LOGGING_CATEGORY(SceneParsers)
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExporter : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExporter : public QObject
{
Q_OBJECT
Q_PROPERTY(QStringList errors READ errors NOTIFY errorsChanged)
diff --git a/src/render/io/qsceneexportfactory_p.h b/src/render/io/qsceneexportfactory_p.h
index 5ff6149f4..fbb278ebe 100644
--- a/src/render/io/qsceneexportfactory_p.h
+++ b/src/render/io/qsceneexportfactory_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
class QSceneExporter;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory
{
public:
static QStringList keys(const QString &pluginPath = QString());
diff --git a/src/render/io/qsceneexportplugin_p.h b/src/render/io/qsceneexportplugin_p.h
index 3515cd425..dcc1c7769 100644
--- a/src/render/io/qsceneexportplugin_p.h
+++ b/src/render/io/qsceneexportplugin_p.h
@@ -65,7 +65,7 @@ namespace Qt3DRender {
class QSceneExporter;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneExportPlugin : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportPlugin : public QObject
{
Q_OBJECT
public:
diff --git a/src/render/io/qsceneimporter_p.h b/src/render/io/qsceneimporter_p.h
index 8f83231c3..910a7fc66 100644
--- a/src/render/io/qsceneimporter_p.h
+++ b/src/render/io/qsceneimporter_p.h
@@ -67,7 +67,7 @@ namespace Qt3DRender {
Q_DECLARE_LOGGING_CATEGORY(SceneParsers)
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImporter : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImporter : public QObject
{
Q_OBJECT
Q_PROPERTY(ParserStatus status READ status NOTIFY statusChanged)
diff --git a/src/render/io/qsceneimportfactory_p.h b/src/render/io/qsceneimportfactory_p.h
index c66937fa1..8409ea96d 100644
--- a/src/render/io/qsceneimportfactory_p.h
+++ b/src/render/io/qsceneimportfactory_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
class QSceneImporter;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory
{
public:
static QStringList keys(const QString &pluginPath = QString());
diff --git a/src/render/io/qsceneimportplugin_p.h b/src/render/io/qsceneimportplugin_p.h
index 01ab84060..a24d1fa3e 100644
--- a/src/render/io/qsceneimportplugin_p.h
+++ b/src/render/io/qsceneimportplugin_p.h
@@ -65,7 +65,7 @@ namespace Qt3DRender {
class QSceneImporter;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneImportPlugin : public QObject
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportPlugin : public QObject
{
Q_OBJECT
public:
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h
index c69a4ad98..4cb743333 100644
--- a/src/render/io/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
@@ -51,7 +51,7 @@ namespace Qt3DRender {
class QSceneLoaderPrivate;
-class QT3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent
+class Q_3DRENDERSHARED_EXPORT QSceneLoader : public Qt3DCore::QComponent
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/io/qsceneloader_p.h b/src/render/io/qsceneloader_p.h
index 45a6a1a4e..50745c66f 100644
--- a/src/render/io/qsceneloader_p.h
+++ b/src/render/io/qsceneloader_p.h
@@ -61,7 +61,7 @@ namespace Qt3DRender {
class QSceneImporter;
-class QT3DRENDERSHARED_PRIVATE_EXPORT QSceneLoaderPrivate : public Qt3DCore::QComponentPrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneLoaderPrivate : public Qt3DCore::QComponentPrivate
{
public:
QSceneLoaderPrivate();
diff --git a/src/render/io/qurlhelper_p.h b/src/render/io/qurlhelper_p.h
index c9c4cfd9b..d816d5d31 100644
--- a/src/render/io/qurlhelper_p.h
+++ b/src/render/io/qurlhelper_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QT3DRENDERSHARED_EXPORT QUrlHelper
+class Q_3DRENDERSHARED_EXPORT QUrlHelper
{
public:
static QString urlToLocalFileOrQrc(const QUrl &url);