Merge remote-tracking branch origin/5.13 into dev

Change-Id: Ib5c04e9941aeea1a4cd27519b94b9a53e8349ea3

34 files changed, 37 insertions, 37 deletions

diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
index 339ad7324..e8e397883 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode_p.h
+++ b/src/input/backend/qabstractphysicaldevicebackendnode_p.h
@@ -66,7 +66,7 @@ namespace Qt3DInput {
 class QInputAspect;
 class QAbstractPhysicalDeviceBackendNodePrivate;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNode : public Qt3DCore::QBackendNode
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNode : public Qt3DCore::QBackendNode
 {
 public:
     explicit QAbstractPhysicalDeviceBackendNode(QBackendNode::Mode mode);
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
index d6928aced..4b0c47b36 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
+++ b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h
@@ -83,7 +83,7 @@ class AxisSetting;
 
 }
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNodePrivate : public Qt3DCore::QBackendNodePrivate
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceBackendNodePrivate : public Qt3DCore::QBackendNodePrivate
 {
 public:
     explicit QAbstractPhysicalDeviceBackendNodePrivate(Qt3DCore::QBackendNode::Mode mode = Qt3DCore::QBackendNode::ReadOnly);
diff --git a/src/input/frontend/qabstractactioninput.h b/src/input/frontend/qabstractactioninput.h
index a0c18cb54..0bafec351 100644
--- a/src/input/frontend/qabstractactioninput.h
+++ b/src/input/frontend/qabstractactioninput.h
@@ -48,7 +48,7 @@ namespace Qt3DInput {
 
 class QAbstractActionInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAbstractActionInput : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAbstractActionInput : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
diff --git a/src/input/frontend/qabstractaxisinput.h b/src/input/frontend/qabstractaxisinput.h
index c0a93da31..fa3dc2fa8 100644
--- a/src/input/frontend/qabstractaxisinput.h
+++ b/src/input/frontend/qabstractaxisinput.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDevice;
 class QAbstractAxisInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAbstractAxisInput : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAbstractAxisInput : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h
index bf93bc955..9e95d05f0 100644
--- a/src/input/frontend/qabstractphysicaldevice.h
+++ b/src/input/frontend/qabstractphysicaldevice.h
@@ -53,7 +53,7 @@ class QAxisSetting;
 class QInputAspect;
 class QAbstractPhysicalDevicePrivate;
 
-class QT3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAbstractPhysicalDevice : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
diff --git a/src/input/frontend/qabstractphysicaldevice_p.h b/src/input/frontend/qabstractphysicaldevice_p.h
index e2b67a815..8fa72aa02 100644
--- a/src/input/frontend/qabstractphysicaldevice_p.h
+++ b/src/input/frontend/qabstractphysicaldevice_p.h
@@ -65,7 +65,7 @@ namespace Qt3DInput {
 
 class QAxisSetting;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDevicePrivate : public Qt3DCore::QNodePrivate
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDevicePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QAbstractPhysicalDevicePrivate();
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
index 64c634733..e250b9eb9 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h
+++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h
@@ -61,7 +61,7 @@ namespace Qt3DInput {
 
 class QAbstractPhysicalDeviceProxyPrivate;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceProxy : public QAbstractPhysicalDevice
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceProxy : public QAbstractPhysicalDevice
 {
     Q_OBJECT
     Q_PROPERTY(QString deviceName READ deviceName CONSTANT)
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p_p.h
index 2ba8f3bde..8f8d1bea3 100644
--- a/src/input/frontend/qabstractphysicaldeviceproxy_p_p.h
+++ b/src/input/frontend/qabstractphysicaldeviceproxy_p_p.h
@@ -62,7 +62,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDeviceProxy;
 class QAbstractPhysicalDevice;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceProxyPrivate : public QAbstractPhysicalDevicePrivate
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QAbstractPhysicalDeviceProxyPrivate : public QAbstractPhysicalDevicePrivate
 {
 public:
     explicit QAbstractPhysicalDeviceProxyPrivate(const QString &deviceName);
diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h
index 4b282e0b9..f15159f68 100644
--- a/src/input/frontend/qaction.h
+++ b/src/input/frontend/qaction.h
@@ -50,7 +50,7 @@ namespace Qt3DInput {
 class QActionPrivate;
 class QAbstractActionInput;
 
-class QT3DINPUTSHARED_EXPORT QAction : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAction : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index c4c2c934f..be620c5fb 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDevice;
 class QActionInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInput
+class Q_3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInput
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
diff --git a/src/input/frontend/qanalogaxisinput.h b/src/input/frontend/qanalogaxisinput.h
index 9fe221b61..fca13a822 100644
--- a/src/input/frontend/qanalogaxisinput.h
+++ b/src/input/frontend/qanalogaxisinput.h
@@ -49,7 +49,7 @@ namespace Qt3DInput {
 
 class QAnalogAxisInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAnalogAxisInput : public QAbstractAxisInput
+class Q_3DINPUTSHARED_EXPORT QAnalogAxisInput : public QAbstractAxisInput
 {
     Q_OBJECT
     Q_PROPERTY(int axis READ axis WRITE setAxis NOTIFY axisChanged)
diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h
index a6d0b3b1f..a4f7ea7d4 100644
--- a/src/input/frontend/qaxis.h
+++ b/src/input/frontend/qaxis.h
@@ -49,7 +49,7 @@ namespace Qt3DInput {
 class QAxisPrivate;
 class QAbstractAxisInput;
 
-class QT3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAxis : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(float value READ value NOTIFY valueChanged)
diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h
index 633713bb9..e5f35a32f 100644
--- a/src/input/frontend/qaxisaccumulator.h
+++ b/src/input/frontend/qaxisaccumulator.h
@@ -50,7 +50,7 @@ namespace Qt3DInput {
 class QAxis;
 class QAxisAccumulatorPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAxisAccumulator : public Qt3DCore::QComponent
+class Q_3DINPUTSHARED_EXPORT QAxisAccumulator : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QAxis *sourceAxis READ sourceAxis WRITE setSourceAxis NOTIFY sourceAxisChanged)
diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h
index 196dec735..979643e39 100644
--- a/src/input/frontend/qaxissetting.h
+++ b/src/input/frontend/qaxissetting.h
@@ -50,7 +50,7 @@ namespace Qt3DInput {
 
 class QAxisSettingPrivate;
 
-class QT3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode
+class Q_3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(float deadZoneRadius READ deadZoneRadius WRITE setDeadZoneRadius NOTIFY deadZoneRadiusChanged)
diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h
index 38223b6bf..15c6eec28 100644
--- a/src/input/frontend/qbuttonaxisinput.h
+++ b/src/input/frontend/qbuttonaxisinput.h
@@ -49,7 +49,7 @@ namespace Qt3DInput {
 
 class QButtonAxisInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QButtonAxisInput : public QAbstractAxisInput
+class Q_3DINPUTSHARED_EXPORT QButtonAxisInput : public QAbstractAxisInput
 {
     Q_OBJECT
     Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
diff --git a/src/input/frontend/qgamepadinput_p.h b/src/input/frontend/qgamepadinput_p.h
index c064f1c94..fa47fc17c 100644
--- a/src/input/frontend/qgamepadinput_p.h
+++ b/src/input/frontend/qgamepadinput_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 class QGamepadInputPrivate;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QGamepadInput : public QAbstractPhysicalDevice
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QGamepadInput : public QAbstractPhysicalDevice
 {
     Q_OBJECT
     Q_PROPERTY(int deviceId READ deviceId WRITE setDeviceId NOTIFY deviceIdChanged)
diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h
index b46eada67..ea04e7290 100644
--- a/src/input/frontend/qgenericinputdevice_p.h
+++ b/src/input/frontend/qgenericinputdevice_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QGenericInputDevice : public QAbstractPhysicalDevice
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QGenericInputDevice : public QAbstractPhysicalDevice
 {
     Q_OBJECT
     Q_PROPERTY(QVariantMap axesMap READ axesMap WRITE setAxesMap NOTIFY axesMapChanged)
diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h
index 90781d297..2e9ff76a3 100644
--- a/src/input/frontend/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
@@ -51,7 +51,7 @@ class QAbstractPhysicalDevice;
 class QInputAspectPrivate;
 class QInputDeviceIntegration;
 
-class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect
+class Q_3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h
index cfc5806d7..570590229 100644
--- a/src/input/frontend/qinputchord.h
+++ b/src/input/frontend/qinputchord.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDevice;
 class QInputChordPrivate;
 
-class QT3DINPUTSHARED_EXPORT QInputChord : public Qt3DInput::QAbstractActionInput
+class Q_3DINPUTSHARED_EXPORT QInputChord : public Qt3DInput::QAbstractActionInput
 {
     Q_OBJECT
     Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h
index a066d7629..4522e2654 100644
--- a/src/input/frontend/qinputdeviceintegration_p.h
+++ b/src/input/frontend/qinputdeviceintegration_p.h
@@ -72,7 +72,7 @@ class QInputAspect;
 class QAbstractPhysicalDevice;
 class QInputDeviceIntegrationPrivate;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QInputDeviceIntegration : public QObject
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QInputDeviceIntegration : public QObject
 {
     Q_OBJECT
 protected:
diff --git a/src/input/frontend/qinputdeviceintegration_p_p.h b/src/input/frontend/qinputdeviceintegration_p_p.h
index 31eea4cdf..35317972f 100644
--- a/src/input/frontend/qinputdeviceintegration_p_p.h
+++ b/src/input/frontend/qinputdeviceintegration_p_p.h
@@ -61,7 +61,7 @@ namespace Qt3DInput {
 class QInputAspect;
 class QInputDeviceIntegration;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QInputDeviceIntegrationPrivate : public QObjectPrivate
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QInputDeviceIntegrationPrivate : public QObjectPrivate
 {
 public:
     QInputDeviceIntegrationPrivate();
diff --git a/src/input/frontend/qinputdeviceplugin_p.h b/src/input/frontend/qinputdeviceplugin_p.h
index a2f93eb3f..afce96a19 100644
--- a/src/input/frontend/qinputdeviceplugin_p.h
+++ b/src/input/frontend/qinputdeviceplugin_p.h
@@ -63,7 +63,7 @@ namespace Qt3DInput {
 
 class QInputDeviceIntegration;
 
-class QT3DINPUTSHARED_PRIVATE_EXPORT QInputDevicePlugin : public QObject
+class Q_3DINPUTSHARED_PRIVATE_EXPORT QInputDevicePlugin : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h
index acdad12d2..9d4aea6fc 100644
--- a/src/input/frontend/qinputsequence.h
+++ b/src/input/frontend/qinputsequence.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDevice;
 class QInputSequencePrivate;
 
-class QT3DINPUTSHARED_EXPORT QInputSequence : public Qt3DInput::QAbstractActionInput
+class Q_3DINPUTSHARED_EXPORT QInputSequence : public Qt3DInput::QAbstractActionInput
 {
     Q_OBJECT
     Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h
index 10f25d6ee..10e883ac4 100644
--- a/src/input/frontend/qinputsettings.h
+++ b/src/input/frontend/qinputsettings.h
@@ -49,7 +49,7 @@ namespace Qt3DInput {
 
 class QInputSettingsPrivate;
 
-class QT3DINPUTSHARED_EXPORT QInputSettings : public Qt3DCore::QComponent
+class Q_3DINPUTSHARED_EXPORT QInputSettings : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QObject *eventSource READ eventSource WRITE setEventSource NOTIFY eventSourceChanged)
diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h
index b418be5ff..c3478ec27 100644
--- a/src/input/frontend/qkeyboarddevice.h
+++ b/src/input/frontend/qkeyboarddevice.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QKeyboardDevicePrivate;
 class QKeyboardHandler;
 
-class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysicalDevice
+class Q_3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysicalDevice
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QKeyboardHandler *activeInput READ activeInput NOTIFY activeInputChanged)
diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h
index 02b4fe1db..056d7c7a4 100644
--- a/src/input/frontend/qkeyboardhandler.h
+++ b/src/input/frontend/qkeyboardhandler.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QKeyboardDevice;
 class QKeyboardHandlerPrivate;
 
-class QT3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent
+class Q_3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QKeyboardDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
diff --git a/src/input/frontend/qkeyevent.h b/src/input/frontend/qkeyevent.h
index e028438ce..c1e221aae 100644
--- a/src/input/frontend/qkeyevent.h
+++ b/src/input/frontend/qkeyevent.h
@@ -53,7 +53,7 @@ class QKeyEvent;
 
 typedef QSharedPointer<QKeyEvent> QKeyEventPtr;
 
-class QT3DINPUTSHARED_EXPORT QKeyEvent : public QObject
+class Q_3DINPUTSHARED_EXPORT QKeyEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int key READ key CONSTANT)
diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h
index 4b32a0c90..b60000717 100644
--- a/src/input/frontend/qlogicaldevice.h
+++ b/src/input/frontend/qlogicaldevice.h
@@ -51,7 +51,7 @@ class QLogicalDevicePrivate;
 class QAction;
 class QAxis;
 
-class QT3DINPUTSHARED_EXPORT QLogicalDevice : public Qt3DCore::QComponent
+class Q_3DINPUTSHARED_EXPORT QLogicalDevice : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h
index 9e6d2c5ac..01e243790 100644
--- a/src/input/frontend/qmousedevice.h
+++ b/src/input/frontend/qmousedevice.h
@@ -53,7 +53,7 @@ class QMouseHandler;
 class QMouseInput;
 
 
-class QT3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalDevice
+class Q_3DINPUTSHARED_EXPORT QMouseDevice : public Qt3DInput::QAbstractPhysicalDevice
 {
     Q_OBJECT
     Q_PROPERTY(float sensitivity READ sensitivity WRITE setSensitivity NOTIFY sensitivityChanged)
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h
index 9c6386036..a7aa8fe2b 100644
--- a/src/input/frontend/qmouseevent.h
+++ b/src/input/frontend/qmouseevent.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QT3DINPUTSHARED_EXPORT QMouseEvent : public QObject
+class Q_3DINPUTSHARED_EXPORT QMouseEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int x READ x CONSTANT)
@@ -108,7 +108,7 @@ private:
 typedef QSharedPointer<QMouseEvent> QMouseEventPtr;
 
 #if QT_CONFIG(wheelevent)
-class QT3DINPUTSHARED_EXPORT QWheelEvent : public QObject
+class Q_3DINPUTSHARED_EXPORT QWheelEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int x READ x CONSTANT)
diff --git a/src/input/frontend/qmousehandler.h b/src/input/frontend/qmousehandler.h
index 50f7b028a..aec450cb9 100644
--- a/src/input/frontend/qmousehandler.h
+++ b/src/input/frontend/qmousehandler.h
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 class QMouseDevice;
 class QMouseHandlerPrivate;
 
-class QT3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent
+class Q_3DINPUTSHARED_EXPORT QMouseHandler : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QMouseDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
diff --git a/src/input/frontend/qphysicaldevicecreatedchange.h b/src/input/frontend/qphysicaldevicecreatedchange.h
index 65cc4004a..6ffe559e9 100644
--- a/src/input/frontend/qphysicaldevicecreatedchange.h
+++ b/src/input/frontend/qphysicaldevicecreatedchange.h
@@ -47,7 +47,7 @@ namespace Qt3DInput {
 class QAbstractPhysicalDevice;
 class QPhysicalDeviceCreatedChangeBasePrivate;
 
-class QT3DINPUTSHARED_EXPORT QPhysicalDeviceCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
+class Q_3DINPUTSHARED_EXPORT QPhysicalDeviceCreatedChangeBase : public Qt3DCore::QNodeCreatedChangeBase
 {
 public:
     explicit QPhysicalDeviceCreatedChangeBase(const QAbstractPhysicalDevice *device);
diff --git a/src/input/qt3dinput_global.h b/src/input/qt3dinput_global.h
index 9c76435f9..ee380fbc7 100644
--- a/src/input/qt3dinput_global.h
+++ b/src/input/qt3dinput_global.h
@@ -46,12 +46,12 @@ QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
 #  if defined(QT_BUILD_3DINPUT_LIB)
-#    define QT3DINPUTSHARED_EXPORT Q_DECL_EXPORT
+#    define Q_3DINPUTSHARED_EXPORT Q_DECL_EXPORT
 #  else
-#    define QT3DINPUTSHARED_EXPORT Q_DECL_IMPORT
+#    define Q_3DINPUTSHARED_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define QT3DINPUTSHARED_EXPORT
+#  define Q_3DINPUTSHARED_EXPORT
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/input/qt3dinput_global_p.h b/src/input/qt3dinput_global_p.h
index 1bbc488dc..5ea3a8c5a 100644
--- a/src/input/qt3dinput_global_p.h
+++ b/src/input/qt3dinput_global_p.h
@@ -53,7 +53,7 @@
 
 #include "qt3dinput_global.h"
 
-#define QT3DINPUTSHARED_PRIVATE_EXPORT QT3DINPUTSHARED_EXPORT
+#define Q_3DINPUTSHARED_PRIVATE_EXPORT Q_3DINPUTSHARED_EXPORT
 
 #endif // QT3DINPUT_GLOBAL_P_H