13 files changed, 15 insertions, 15 deletions
diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h
index ff8d6d5c2..6a3911dbd 100644
--- a/src/core/nodes/propertychangehandler_p.h
+++ b/src/core/nodes/propertychangehandler_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORESHARED_EXPORT PropertyChangeHandlerBase : public QObject
+class Q_3DCORESHARED_EXPORT PropertyChangeHandlerBase : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/nodes/qabstractnodefactory_p.h b/src/core/nodes/qabstractnodefactory_p.h
index dbe0adffe..de1b758a9 100644
--- a/src/core/nodes/qabstractnodefactory_p.h
+++ b/src/core/nodes/qabstractnodefactory_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORE_PRIVATE_EXPORT QAbstractNodeFactory
+class Q_3DCORE_PRIVATE_EXPORT QAbstractNodeFactory
 {
 public:
     virtual ~QAbstractNodeFactory();
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h
index 99e483cff..21485cd5f 100644
--- a/src/core/nodes/qbackendnode.h
+++ b/src/core/nodes/qbackendnode.h
@@ -58,7 +58,7 @@ class QAspectEngine;
 class QBackendNodeTester;
 #endif
 
-class QT3DCORESHARED_EXPORT QBackendNodeMapper
+class Q_3DCORESHARED_EXPORT QBackendNodeMapper
 {
 public:
     virtual ~QBackendNodeMapper();
@@ -69,7 +69,7 @@ public:
 
 typedef QSharedPointer<QBackendNodeMapper> QBackendNodeMapperPtr;
 
-class QT3DCORESHARED_EXPORT QBackendNode
+class Q_3DCORESHARED_EXPORT QBackendNode
 {
 public:
     enum Mode {
diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h
index 358b3ab8e..dde86fa48 100644
--- a/src/core/nodes/qbackendnode_p.h
+++ b/src/core/nodes/qbackendnode_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORE_PRIVATE_EXPORT QBackendNodePrivate
+class Q_3DCORE_PRIVATE_EXPORT QBackendNodePrivate
         : public QObserverInterface
         , public QObservableInterface
 {
diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h
index 639f9446c..182a21e50 100644
--- a/src/core/nodes/qcomponent.h
+++ b/src/core/nodes/qcomponent.h
@@ -49,7 +49,7 @@ namespace Qt3DCore {
 
 class QComponentPrivate;
 
-class QT3DCORESHARED_EXPORT QComponent : public QNode
+class Q_3DCORESHARED_EXPORT QComponent : public QNode
 {
     Q_OBJECT
     Q_PROPERTY(bool isShareable READ isShareable WRITE setShareable NOTIFY shareableChanged)
diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h
index 0b3a961ab..d28433d23 100644
--- a/src/core/nodes/qcomponent_p.h
+++ b/src/core/nodes/qcomponent_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORE_PRIVATE_EXPORT QComponentPrivate : public QNodePrivate
+class Q_3DCORE_PRIVATE_EXPORT QComponentPrivate : public QNodePrivate
 {
 public:
     QComponentPrivate();
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index ef6aedc4d..bbf38efb4 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -53,7 +53,7 @@ class QEntityPrivate;
 
 typedef QVector<QComponent*> QComponentVector;
 
-class QT3DCORESHARED_EXPORT QEntity : public QNode
+class Q_3DCORESHARED_EXPORT QEntity : public QNode
 {
     Q_OBJECT
 public:
diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h
index 8fe03cd6b..ee6db75db 100644
--- a/src/core/nodes/qentity_p.h
+++ b/src/core/nodes/qentity_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORE_PRIVATE_EXPORT QEntityPrivate : public QNodePrivate
+class Q_3DCORE_PRIVATE_EXPORT QEntityPrivate : public QNodePrivate
 {
 public :
     QEntityPrivate();
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index 1fe03f5e0..d4e4ff088 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -65,7 +65,7 @@ class QBackendNodeTester;
 typedef QVector<QNode *> QNodeVector;
 typedef QSharedPointer<QNode> QNodePtr;
 
-class QT3DCORESHARED_EXPORT QNode : public QObject
+class Q_3DCORESHARED_EXPORT QNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged)
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 6ffb19ce8..fd3265870 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -68,7 +68,7 @@ namespace Qt3DCore {
 class QNode;
 class QAspectEngine;
 
-class QT3DCORE_PRIVATE_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface
+class Q_3DCORE_PRIVATE_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface
 {
 public:
     QNodePrivate();
diff --git a/src/core/nodes/qnodecreatedchangegenerator_p.h b/src/core/nodes/qnodecreatedchangegenerator_p.h
index 42c2847cc..b2e8fa08b 100644
--- a/src/core/nodes/qnodecreatedchangegenerator_p.h
+++ b/src/core/nodes/qnodecreatedchangegenerator_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QT3DCORE_PRIVATE_EXPORT QNodeCreatedChangeGenerator
+class Q_3DCORE_PRIVATE_EXPORT QNodeCreatedChangeGenerator
 {
 public:
     QNodeCreatedChangeGenerator(QNode *rootNode);
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h
index a00559df3..0fd81e790 100644
--- a/src/core/nodes/qnodeid.h
+++ b/src/core/nodes/qnodeid.h
@@ -58,7 +58,7 @@ public:
         : m_id(0)
     {}
 
-    QT3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW;
+    Q_3DCORESHARED_EXPORT static QNodeId createId() Q_DECL_NOTHROW;
 
     Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW
     {
@@ -103,7 +103,7 @@ QT3D_DECLARE_TYPEINFO(Qt3DCore, QNodeId, Q_PRIMITIVE_TYPE)
 typedef QVector<QNodeId> QNodeIdVector;
 
 #ifndef QT_NO_DEBUG_STREAM
-QT3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id);
+Q_3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id);
 #endif
 
 inline Q_DECL_CONSTEXPR uint qHash(QNodeId id, uint seed = 0) Q_DECL_NOTHROW
diff --git a/src/core/nodes/qnodevisitor_p.h b/src/core/nodes/qnodevisitor_p.h
index 15bfa90db..c7c75710a 100644
--- a/src/core/nodes/qnodevisitor_p.h
+++ b/src/core/nodes/qnodevisitor_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCore
 {
 
-class QT3DCORESHARED_EXPORT QNodeVisitor
+class Q_3DCORESHARED_EXPORT QNodeVisitor
 {
 public:
     QNodeVisitor();