diff options
105 files changed, 307 insertions, 208 deletions
diff --git a/src/input/backend/abstractaxisinput.cpp b/src/input/backend/abstractaxisinput.cpp index 5cb209f25..aae165a7e 100644 --- a/src/input/backend/abstractaxisinput.cpp +++ b/src/input/backend/abstractaxisinput.cpp @@ -37,13 +37,15 @@ ** ****************************************************************************/ -#include "abstractaxisinput_p.h" -#include <Qt3DInput/qabstractaxisinput.h> +#include "qabstractaxisinput.h" +#include "qabstractaxisinput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DInput/private/abstractaxisinput_p.h> #include <Qt3DInput/private/inputhandler_p.h> -#include <Qt3DInput/private/qabstractaxisinput_p.h> #include <Qt3DInput/private/qinputdeviceintegration_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp index b7fa8740e..601961dd9 100644 --- a/src/input/backend/action.cpp +++ b/src/input/backend/action.cpp @@ -38,13 +38,15 @@ ****************************************************************************/ #include "action_p.h" + #include <Qt3DInput/qaction.h> #include <Qt3DInput/qabstractactioninput.h> -#include <Qt3DInput/private/qaction_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DInput/private/qaction_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp index b120c789e..46dc7f584 100644 --- a/src/input/backend/actioninput.cpp +++ b/src/input/backend/actioninput.cpp @@ -38,10 +38,12 @@ ****************************************************************************/ #include "actioninput_p.h" + #include <Qt3DInput/qactioninput.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DInput/private/qactioninput_p.h> #include <Qt3DInput/private/inputhandler_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/utils_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h index da99c985e..3059f66cf 100644 --- a/src/input/backend/actioninput_p.h +++ b/src/input/backend/actioninput_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/abstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/abstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/analogaxisinput.cpp b/src/input/backend/analogaxisinput.cpp index 914604e33..4a801baec 100644 --- a/src/input/backend/analogaxisinput.cpp +++ b/src/input/backend/analogaxisinput.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "analogaxisinput_p.h" + #include <Qt3DInput/qanalogaxisinput.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> #include <Qt3DInput/private/qanalogaxisinput_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/utils_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp index ae845beaf..216c914d4 100644 --- a/src/input/backend/assignkeyboardfocusjob.cpp +++ b/src/input/backend/assignkeyboardfocusjob.cpp @@ -38,11 +38,12 @@ ****************************************************************************/ #include "assignkeyboardfocusjob_p.h" -#include "keyboarddevice_p.h" -#include "keyboardhandler_p.h" -#include "inputhandler_p.h" -#include "inputmanagers_p.h" -#include "job_common_p.h" + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/job_common_p.h> +#include <Qt3DInput/private/keyboarddevice_p.h> +#include <Qt3DInput/private/keyboardhandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp index 4239749c1..6ba4e2b34 100644 --- a/src/input/backend/axis.cpp +++ b/src/input/backend/axis.cpp @@ -38,13 +38,15 @@ ****************************************************************************/ #include "axis_p.h" + #include <Qt3DInput/qaxis.h> #include <Qt3DInput/qabstractaxisinput.h> -#include <Qt3DInput/private/qaxis_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DInput/private/qaxis_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/axisaccumulator.cpp b/src/input/backend/axisaccumulator.cpp index 3b0423f47..edc282bec 100644 --- a/src/input/backend/axisaccumulator.cpp +++ b/src/input/backend/axisaccumulator.cpp @@ -38,10 +38,12 @@ ****************************************************************************/ #include "axisaccumulator_p.h" -#include <Qt3DInput/private/qaxisaccumulator_p.h> -#include <Qt3DInput/private/inputmanagers_p.h> + #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/qaxisaccumulator_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/axisaccumulator_p.h b/src/input/backend/axisaccumulator_p.h index 67eb3906a..7d6799eb0 100644 --- a/src/input/backend/axisaccumulator_p.h +++ b/src/input/backend/axisaccumulator_p.h @@ -51,11 +51,10 @@ // We mean it. // +#include <Qt3DInput/qaxisaccumulator.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> -#include <Qt3DInput/qaxisaccumulator.h> - QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/axisaccumulatorjob.cpp b/src/input/backend/axisaccumulatorjob.cpp index 133f9713a..7ea2d063d 100644 --- a/src/input/backend/axisaccumulatorjob.cpp +++ b/src/input/backend/axisaccumulatorjob.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "axisaccumulatorjob_p.h" + #include <Qt3DInput/private/axisaccumulator_p.h> #include <Qt3DInput/private/job_common_p.h> #include <Qt3DInput/private/inputmanagers_p.h> diff --git a/src/input/backend/axisaccumulatorjob_p.h b/src/input/backend/axisaccumulatorjob_p.h index d8ced8a3a..4d38fd70f 100644 --- a/src/input/backend/axisaccumulatorjob_p.h +++ b/src/input/backend/axisaccumulatorjob_p.h @@ -51,9 +51,9 @@ // We mean it. // +#include <Qt3DInput/private/handle_types_p.h> #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> -#include <Qt3DInput/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/axissetting.cpp b/src/input/backend/axissetting.cpp index 10892f861..b3c81f84d 100644 --- a/src/input/backend/axissetting.cpp +++ b/src/input/backend/axissetting.cpp @@ -38,10 +38,12 @@ ****************************************************************************/ #include "axissetting_p.h" + #include <Qt3DInput/qaxissetting.h> -#include <Qt3DInput/private/qaxissetting_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/private/qaxissetting_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/buttonaxisinput.cpp b/src/input/backend/buttonaxisinput.cpp index 99fa99852..fef8f6d41 100644 --- a/src/input/backend/buttonaxisinput.cpp +++ b/src/input/backend/buttonaxisinput.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "buttonaxisinput_p.h" + #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> #include <Qt3DInput/private/qbuttonaxisinput_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/private/utils_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/eventsourcesetterhelper.cpp b/src/input/backend/eventsourcesetterhelper.cpp index 4ae6cebae..5c11ada38 100644 --- a/src/input/backend/eventsourcesetterhelper.cpp +++ b/src/input/backend/eventsourcesetterhelper.cpp @@ -38,7 +38,8 @@ ****************************************************************************/ #include "eventsourcesetterhelper_p.h" -#include "inputhandler_p.h" + +#include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DCore/private/qeventfilterservice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/eventsourcesetterhelper_p.h b/src/input/backend/eventsourcesetterhelper_p.h index 97776dc9b..48418f1b9 100644 --- a/src/input/backend/eventsourcesetterhelper_p.h +++ b/src/input/backend/eventsourcesetterhelper_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <QObject> -#include <QMutex> +#include <QtCore/QMutex> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/genericdevicebackendnode.cpp b/src/input/backend/genericdevicebackendnode.cpp index 093acd966..40202b4a5 100644 --- a/src/input/backend/genericdevicebackendnode.cpp +++ b/src/input/backend/genericdevicebackendnode.cpp @@ -38,11 +38,12 @@ ****************************************************************************/ #include "genericdevicebackendnode_p.h" -#include "inputhandler_p.h" -#include "inputmanagers_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/genericdevicebackendnode_p.h b/src/input/backend/genericdevicebackendnode_p.h index 8c0ffcfde..16aaf3e5b 100644 --- a/src/input/backend/genericdevicebackendnode_p.h +++ b/src/input/backend/genericdevicebackendnode_p.h @@ -51,9 +51,10 @@ // We mean it. // +#include <QtCore/QHash> +#include <QtCore/QMutex> + #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> -#include <QHash> -#include <QMutex> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp index ebcf79737..731fd91e3 100644 --- a/src/input/backend/inputchord.cpp +++ b/src/input/backend/inputchord.cpp @@ -38,13 +38,15 @@ ****************************************************************************/ #include "inputchord_p.h" + #include <Qt3DInput/qinputchord.h> -#include <Qt3DInput/private/qinputchord_p.h> -#include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DInput/private/qinputchord_p.h> +#include <Qt3DInput/private/inputhandler_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/inputchord_p.h b/src/input/backend/inputchord_p.h index 7f51f5d96..95557a00d 100644 --- a/src/input/backend/inputchord_p.h +++ b/src/input/backend/inputchord_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/abstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/abstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp index aebf2c8f1..985d67470 100644 --- a/src/input/backend/inputhandler.cpp +++ b/src/input/backend/inputhandler.cpp @@ -38,16 +38,17 @@ ****************************************************************************/ #include "inputhandler_p.h" -#include "inputmanagers_p.h" -#include "keyboardeventfilter_p.h" -#include "mouseeventfilter_p.h" -#include "assignkeyboardfocusjob_p.h" -#include "keyeventdispatcherjob_p.h" -#include "mouseeventdispatcherjob_p.h" -#include <Qt3DCore/private/qeventfilterservice_p.h> -#include "inputsettings_p.h" -#include "eventsourcesetterhelper_p.h" + +#include <Qt3DInput/private/assignkeyboardfocusjob_p.h> +#include <Qt3DInput/private/eventsourcesetterhelper_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/inputsettings_p.h> +#include <Qt3DInput/private/keyboardeventfilter_p.h> +#include <Qt3DInput/private/keyeventdispatcherjob_p.h> +#include <Qt3DInput/private/mouseeventdispatcherjob_p.h> +#include <Qt3DInput/private/mouseeventfilter_p.h> #include <Qt3DInput/private/qinputdeviceintegration_p.h> +#include <Qt3DCore/private/qeventfilterservice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputhandler_p.h b/src/input/backend/inputhandler_p.h index eff0c0c24..e80441f1a 100644 --- a/src/input/backend/inputhandler_p.h +++ b/src/input/backend/inputhandler_p.h @@ -51,11 +51,12 @@ // We mean it. // +#include <Qt3DInput/QKeyEvent> #include <Qt3DInput/qt3dinput_global.h> -#include <Qt3DInput/private/handle_types_p.h> #include <Qt3DCore/qaspectjob.h> -#include <QKeyEvent> -#include <QMutex> +#include <QtCore/QMutex> + +#include <Qt3DInput/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h index 473042867..a0cb127b1 100644 --- a/src/input/backend/inputmanagers_p.h +++ b/src/input/backend/inputmanagers_p.h @@ -51,13 +51,13 @@ // We mean it. // -#include <QtGlobal> +#include <QtCore/QtGlobal> + #include <Qt3DInput/private/handle_types_p.h> #include <Qt3DInput/private/keyboarddevice_p.h> #include <Qt3DInput/private/keyboardhandler_p.h> #include <Qt3DInput/private/mousehandler_p.h> #include <Qt3DInput/private/mousedevice_p.h> -#include <Qt3DCore/private/qresourcemanager_p.h> #include <Qt3DInput/private/actioninput_p.h> #include <Qt3DInput/private/inputsequence_p.h> #include <Qt3DInput/private/inputchord_p.h> @@ -70,6 +70,7 @@ #include <Qt3DInput/private/logicaldevice_p.h> #include <Qt3DInput/private/genericdevicebackendnode_p.h> #include <Qt3DInput/private/physicaldeviceproxy_p.h> +#include <Qt3DCore/private/qresourcemanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp index ee31cb1de..e45fae364 100644 --- a/src/input/backend/inputsequence.cpp +++ b/src/input/backend/inputsequence.cpp @@ -38,14 +38,16 @@ ****************************************************************************/ #include "inputsequence_p.h" -#include <Qt3DInput/qinputsequence.h> + #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/private/qinputsequence_p.h> -#include <Qt3DInput/private/inputhandler_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qinputsequence.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> -#include <QDateTime> +#include <Qt3DCore/qpropertyupdatedchange.h> +#include <QtCore/QDateTime> + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/qinputsequence_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputsequence_p.h b/src/input/backend/inputsequence_p.h index 28cb1c0e1..a9fa2dd2f 100644 --- a/src/input/backend/inputsequence_p.h +++ b/src/input/backend/inputsequence_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/abstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/abstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/inputsettings.cpp b/src/input/backend/inputsettings.cpp index 587e4ce1a..b695ed600 100644 --- a/src/input/backend/inputsettings.cpp +++ b/src/input/backend/inputsettings.cpp @@ -38,10 +38,12 @@ ****************************************************************************/ #include "inputsettings_p.h" + #include <Qt3DInput/qinputsettings.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/qinputsettings_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/inputsettings_p.h b/src/input/backend/inputsettings_p.h index 386716bc5..2fee6c946 100644 --- a/src/input/backend/inputsettings_p.h +++ b/src/input/backend/inputsettings_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <QPointer> #include <Qt3DCore/qbackendnode.h> +#include <QtCore/QPointer> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboarddevice.cpp b/src/input/backend/keyboarddevice.cpp index 2566dacd2..33578bdad 100644 --- a/src/input/backend/keyboarddevice.cpp +++ b/src/input/backend/keyboarddevice.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "keyboarddevice_p.h" -#include "inputhandler_p.h" -#include "inputmanagers_p.h" + +#include <Qt3DInput/QKeyEvent> #include <Qt3DCore/qnode.h> -#include <QKeyEvent> +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> + QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboarddevice_p.h b/src/input/backend/keyboarddevice_p.h index 0ab7d22e8..611a06233 100644 --- a/src/input/backend/keyboarddevice_p.h +++ b/src/input/backend/keyboarddevice_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> +#include <Qt3DInput/QKeyEvent> #include <Qt3DCore/qnodeid.h> + #include <Qt3DInput/private/handle_types_p.h> -#include <QKeyEvent> +#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboardeventfilter.cpp b/src/input/backend/keyboardeventfilter.cpp index e94af9ade..bd3bac5a7 100644 --- a/src/input/backend/keyboardeventfilter.cpp +++ b/src/input/backend/keyboardeventfilter.cpp @@ -38,9 +38,11 @@ ****************************************************************************/ #include "keyboardeventfilter_p.h" -#include "inputhandler_p.h" -#include <QEvent> -#include <QKeyEvent> + +#include <Qt3DInput/QKeyEvent> +#include <QtCore/QEvent> + +#include <Qt3DInput/private/inputhandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboardeventfilter_p.h b/src/input/backend/keyboardeventfilter_p.h index a06b4cdd5..46b8071cd 100644 --- a/src/input/backend/keyboardeventfilter_p.h +++ b/src/input/backend/keyboardeventfilter_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index b96334e50..ae1e6d03c 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -38,13 +38,15 @@ ****************************************************************************/ #include "keyboardhandler_p.h" + +#include <Qt3DInput/qkeyboarddevice.h> #include <Qt3DInput/qkeyboardhandler.h> -#include <Qt3DInput/private/qkeyboardhandler_p.h> -#include "qkeyboarddevice.h" -#include "inputhandler_p.h" -#include "inputmanagers_p.h" #include <Qt3DCore/qpropertyupdatedchange.h> -#include <QVariant> +#include <QtCore/QVariant> + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/qkeyboardhandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h index 6dd3a2c5e..e2aeab4f3 100644 --- a/src/input/backend/keyboardhandler_p.h +++ b/src/input/backend/keyboardhandler_p.h @@ -51,9 +51,9 @@ // We mean it. // +#include <Qt3DInput/qkeyevent.h> #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/qnodeid.h> -#include <Qt3DInput/qkeyevent.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyboardmousegenericdeviceintegration.cpp b/src/input/backend/keyboardmousegenericdeviceintegration.cpp index 31d0ea981..05430b0e8 100644 --- a/src/input/backend/keyboardmousegenericdeviceintegration.cpp +++ b/src/input/backend/keyboardmousegenericdeviceintegration.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "keyboardmousegenericdeviceintegration_p.h" + #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/inputmanagers_p.h> diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp index bbf703a56..ac90e9e37 100644 --- a/src/input/backend/keyeventdispatcherjob.cpp +++ b/src/input/backend/keyeventdispatcherjob.cpp @@ -38,10 +38,11 @@ ****************************************************************************/ #include "keyeventdispatcherjob_p.h" -#include "inputhandler_p.h" -#include "keyboardhandler_p.h" -#include "inputmanagers_p.h" -#include "job_common_p.h" + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/job_common_p.h> +#include <Qt3DInput/private/keyboardhandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h index b89d8ced2..1456f0878 100644 --- a/src/input/backend/keyeventdispatcherjob_p.h +++ b/src/input/backend/keyeventdispatcherjob_p.h @@ -51,9 +51,9 @@ // We mean it. // +#include <Qt3DInput/QKeyEvent> #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> -#include <QKeyEvent> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/loadproxydevicejob.cpp b/src/input/backend/loadproxydevicejob.cpp index 622d7ab83..2ea29b4a9 100644 --- a/src/input/backend/loadproxydevicejob.cpp +++ b/src/input/backend/loadproxydevicejob.cpp @@ -38,9 +38,10 @@ ****************************************************************************/ #include "loadproxydevicejob_p.h" + #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/inputmanagers_p.h> -#include "job_common_p.h" +#include <Qt3DInput/private/job_common_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp index fd4a637f2..5fcfb07bb 100644 --- a/src/input/backend/logicaldevice.cpp +++ b/src/input/backend/logicaldevice.cpp @@ -38,14 +38,16 @@ ****************************************************************************/ #include "logicaldevice_p.h" -#include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DInput/qaxis.h> + #include <Qt3DInput/qaction.h> -#include <Qt3DInput/private/inputmanagers_p.h> -#include <Qt3DInput/private/qlogicaldevice_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qlogicaldevice.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/qlogicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mousedevice.cpp b/src/input/backend/mousedevice.cpp index 918fdecb0..1d329252d 100644 --- a/src/input/backend/mousedevice.cpp +++ b/src/input/backend/mousedevice.cpp @@ -38,15 +38,16 @@ ****************************************************************************/ #include "mousedevice_p.h" -#include "inputmanagers_p.h" -#include "inputhandler_p.h" -#include "qmousedevice.h" -#include <Qt3DInput/private/qmousedevice_p.h> -#include <Qt3DCore/qnode.h> +#include <Qt3DInput/qmousedevice.h> #include <Qt3DCore/qentity.h> +#include <Qt3DCore/qnode.h> #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/qmousedevice_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/backend/mousedevice_p.h b/src/input/backend/mousedevice_p.h index 8b85ee34a..0b95c6183 100644 --- a/src/input/backend/mousedevice_p.h +++ b/src/input/backend/mousedevice_p.h @@ -51,8 +51,9 @@ // We mean it. // +#include <Qt3DInput/QMouseEvent> + #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> -#include <QMouseEvent> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp index 167560e39..77eb69712 100644 --- a/src/input/backend/mouseeventdispatcherjob.cpp +++ b/src/input/backend/mouseeventdispatcherjob.cpp @@ -38,10 +38,11 @@ ****************************************************************************/ #include "mouseeventdispatcherjob_p.h" -#include "inputhandler_p.h" -#include "mousehandler_p.h" -#include "inputmanagers_p.h" -#include "job_common_p.h" + +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/job_common_p.h> +#include <Qt3DInput/private/mousehandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h index defe3c3a3..ebf1538e4 100644 --- a/src/input/backend/mouseeventdispatcherjob_p.h +++ b/src/input/backend/mouseeventdispatcherjob_p.h @@ -51,9 +51,9 @@ // We mean it. // +#include <Qt3DInput/QMouseEvent> #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> -#include <QMouseEvent> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mouseeventfilter.cpp b/src/input/backend/mouseeventfilter.cpp index f12127c3b..bc2473a33 100644 --- a/src/input/backend/mouseeventfilter.cpp +++ b/src/input/backend/mouseeventfilter.cpp @@ -38,9 +38,11 @@ ****************************************************************************/ #include "mouseeventfilter_p.h" -#include "inputhandler_p.h" -#include <QEvent> -#include <QKeyEvent> + +#include <Qt3DInput/QKeyEvent> +#include <QtCore/QEvent> + +#include <Qt3DInput/private/inputhandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mouseeventfilter_p.h b/src/input/backend/mouseeventfilter_p.h index a733b3ad1..340524a61 100644 --- a/src/input/backend/mouseeventfilter_p.h +++ b/src/input/backend/mouseeventfilter_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index b7b748843..a0619aaf2 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -38,15 +38,16 @@ ****************************************************************************/ #include "mousehandler_p.h" -#include "inputmanagers_p.h" -#include "inputhandler_p.h" -#include "mousedevice_p.h" #include <Qt3DInput/qmousehandler.h> -#include <Qt3DInput/private/qmousehandler_p.h> #include <Qt3DInput/qmousedevice.h> #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/mousedevice_p.h> +#include <Qt3DInput/private/qmousehandler_p.h> + QT_BEGIN_NAMESPACE using namespace Qt3DCore; diff --git a/src/input/backend/mousehandler_p.h b/src/input/backend/mousehandler_p.h index b2ae4f9ed..867764017 100644 --- a/src/input/backend/mousehandler_p.h +++ b/src/input/backend/mousehandler_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <Qt3DCore/qbackendnode.h> #include <Qt3DInput/qmouseevent.h> +#include <Qt3DCore/qbackendnode.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/physicaldeviceproxy.cpp b/src/input/backend/physicaldeviceproxy.cpp index 2e46309fd..9512296b8 100644 --- a/src/input/backend/physicaldeviceproxy.cpp +++ b/src/input/backend/physicaldeviceproxy.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "physicaldeviceproxy_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> + #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p_p.h> +#include <Qt3DCore/qpropertyupdatedchange.h> +#include <QtCore/QCoreApplication> + #include <Qt3DInput/private/inputmanagers_p.h> -#include <QCoreApplication> +#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp index 45f228e1a..5006d702a 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp +++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp @@ -39,22 +39,22 @@ #include "qabstractphysicaldevicebackendnode_p.h" #include "qabstractphysicaldevicebackendnode_p_p.h" -#include "qabstractphysicaldevice.h" -#include "qaxissetting.h" -#include "inputhandler_p.h" -#include "inputmanagers_p.h" +#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DInput/qphysicaldevicecreatedchange.h> -#include <Qt3DInput/private/qinputaspect_p.h> - -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> -#include <Qt3DCore/private/qabstractaspect_p.h> +#include <Qt3DCore/qpropertyupdatedchange.h> #include <cmath> +#include <Qt3DInput/private/inputhandler_p.h> +#include <Qt3DInput/private/inputmanagers_p.h> +#include <Qt3DInput/private/qinputaspect_p.h> +#include <Qt3DCore/private/qabstractaspect_p.h> + QT_BEGIN_NAMESPACE namespace { diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p.h index aa789fe27..272143c45 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode_p.h +++ b/src/input/backend/qabstractphysicaldevicebackendnode_p.h @@ -52,6 +52,7 @@ // #include <Qt3DCore/qbackendnode.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h index 8d9ee0617..d6928aced 100644 --- a/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h +++ b/src/input/backend/qabstractphysicaldevicebackendnode_p_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <Qt3DCore/private/qbackendnode_p.h> -#include <Qt3DCore/qnodeid.h> #include <QtCore/qvector.h> -#include <Qt3DInput/private/qt3dinput_global_p.h> +#include <Qt3DCore/qnodeid.h> + #include <Qt3DInput/private/movingaverage_p.h> +#include <Qt3DInput/private/qt3dinput_global_p.h> +#include <Qt3DCore/private/qbackendnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp index 4e990ff0e..03690479a 100644 --- a/src/input/backend/updateaxisactionjob.cpp +++ b/src/input/backend/updateaxisactionjob.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "updateaxisactionjob_p.h" + #include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/inputmanagers_p.h> #include <Qt3DInput/private/job_common_p.h> diff --git a/src/input/backend/updateaxisactionjob_p.h b/src/input/backend/updateaxisactionjob_p.h index ea590a1b2..b65cbec87 100644 --- a/src/input/backend/updateaxisactionjob_p.h +++ b/src/input/backend/updateaxisactionjob_p.h @@ -53,6 +53,7 @@ #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> + #include <Qt3DInput/private/handle_types_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractactioninput.cpp b/src/input/frontend/qabstractactioninput.cpp index f5e9ff33e..5d7af72f8 100644 --- a/src/input/frontend/qabstractactioninput.cpp +++ b/src/input/frontend/qabstractactioninput.cpp @@ -37,6 +37,7 @@ ****************************************************************************/ #include "qabstractactioninput_p.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractactioninput_p.h b/src/input/frontend/qabstractactioninput_p.h index 6741bc4dc..b7494ee38 100644 --- a/src/input/frontend/qabstractactioninput_p.h +++ b/src/input/frontend/qabstractactioninput_p.h @@ -50,7 +50,8 @@ // We mean it. // -#include <Qt3DInput/qabstractactioninput.h> +#include "qabstractactioninput.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput.cpp b/src/input/frontend/qabstractaxisinput.cpp index bcce50a33..e3974421a 100644 --- a/src/input/frontend/qabstractaxisinput.cpp +++ b/src/input/frontend/qabstractaxisinput.cpp @@ -37,8 +37,9 @@ ** ****************************************************************************/ -#include "qabstractaxisinput.h" #include "qabstractaxisinput_p.h" + +#include <Qt3DInput/qabstractaxisinput.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput.h b/src/input/frontend/qabstractaxisinput.h index b26d3249a..c0a93da31 100644 --- a/src/input/frontend/qabstractaxisinput.h +++ b/src/input/frontend/qabstractaxisinput.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QABSTRACTAXISINPUT_H #define QT3DINPUT_QABSTRACTAXISINPUT_H +#include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractaxisinput_p.h b/src/input/frontend/qabstractaxisinput_p.h index f64a140f4..91e02719e 100644 --- a/src/input/frontend/qabstractaxisinput_p.h +++ b/src/input/frontend/qabstractaxisinput_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qvariant.h> +#include <Qt3DCore/private/qnode_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index 4984b4300..8a0e81e0c 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -39,11 +39,13 @@ #include "qabstractphysicaldevice.h" #include "qabstractphysicaldevice_p.h" -#include <Qt3DInput/qphysicaldevicecreatedchange.h> + #include <Qt3DInput/qaxissetting.h> +#include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractphysicaldevice_p.h b/src/input/frontend/qabstractphysicaldevice_p.h index 55e98723c..e2b67a815 100644 --- a/src/input/frontend/qabstractphysicaldevice_p.h +++ b/src/input/frontend/qabstractphysicaldevice_p.h @@ -52,11 +52,12 @@ // #include <Qt3DInput/qt3dinput_global.h> -#include <Qt3DCore/private/qnode_p.h> #include <QtCore/qhash.h> #include <QtCore/qmutex.h> #include <QtCore/qvector.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qabstractphysicaldeviceproxy.cpp b/src/input/frontend/qabstractphysicaldeviceproxy.cpp index 03e59761b..34b7db2a4 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy.cpp +++ b/src/input/frontend/qabstractphysicaldeviceproxy.cpp @@ -39,9 +39,11 @@ #include "qabstractphysicaldeviceproxy_p.h" #include "qabstractphysicaldeviceproxy_p_p.h" + #include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h index 1175f53bb..6d44ad2cd 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h +++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h @@ -52,6 +52,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 3a6e6dc4f..1006c0cec 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -39,12 +39,14 @@ #include "qaction.h" #include "qaction_p.h" -#include <Qt3DCore/private/qnode_p.h> + +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DInput/qabstractactioninput.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp index 5bee62cb9..b8db101d8 100644 --- a/src/input/frontend/qactioninput.cpp +++ b/src/input/frontend/qactioninput.cpp @@ -38,8 +38,9 @@ #include "qactioninput.h" #include "qactioninput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/QAbstractActionInput> +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h index 9b06047b2..580afaf2e 100644 --- a/src/input/frontend/qactioninput.h +++ b/src/input/frontend/qactioninput.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QACTIONINPUT_H #define QT3DINPUT_QACTIONINPUT_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qactioninput_p.h b/src/input/frontend/qactioninput_p.h index d1e9f88dc..74a69d68c 100644 --- a/src/input/frontend/qactioninput_p.h +++ b/src/input/frontend/qactioninput_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <QtCore/qvariant.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp index 6d50af45c..7b85983e3 100644 --- a/src/input/frontend/qanalogaxisinput.cpp +++ b/src/input/frontend/qanalogaxisinput.cpp @@ -39,6 +39,7 @@ #include "qanalogaxisinput.h" #include "qanalogaxisinput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 6b19e43fe..01e28e9cf 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -38,6 +38,7 @@ #include "qaxis.h" #include "qaxis_p.h" + #include <Qt3DInput/qabstractaxisinput.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp index b9a5add35..44bd59223 100644 --- a/src/input/frontend/qaxisaccumulator.cpp +++ b/src/input/frontend/qaxisaccumulator.cpp @@ -39,6 +39,7 @@ #include "qaxisaccumulator.h" #include "qaxisaccumulator_p.h" + #include <Qt3DInput/qaxis.h> #include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> diff --git a/src/input/frontend/qaxisaccumulator_p.h b/src/input/frontend/qaxisaccumulator_p.h index 532f01b6b..a936f54aa 100644 --- a/src/input/frontend/qaxisaccumulator_p.h +++ b/src/input/frontend/qaxisaccumulator_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index 987cd246a..8f1a8d797 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -39,6 +39,7 @@ #include "qaxissetting.h" #include "qaxissetting_p.h" + #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h index 483c6c2a0..b3d244e15 100644 --- a/src/input/frontend/qaxissetting.h +++ b/src/input/frontend/qaxissetting.h @@ -40,9 +40,8 @@ #ifndef QT3DINPUT_QAXISSETTING_H #define QT3DINPUT_QAXISSETTING_H -#include <Qt3DCore/qnode.h> #include <Qt3DInput/qt3dinput_global.h> - +#include <Qt3DCore/qnode.h> #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index e6bfe4f8c..fb74b8efd 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -39,6 +39,7 @@ #include "qbuttonaxisinput.h" #include "qbuttonaxisinput_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgamepadinput.cpp b/src/input/frontend/qgamepadinput.cpp index faf62ae88..a0efecfc0 100644 --- a/src/input/frontend/qgamepadinput.cpp +++ b/src/input/frontend/qgamepadinput.cpp @@ -35,10 +35,11 @@ ****************************************************************************/ #include "qgamepadinput_p.h" -#include "qabstractphysicaldevice_p.h" -#include <QGamepadManager> -#include <QMetaEnum> +#include <QtCore/QMetaEnum> +#include <QtGamepad/QGamepadManager> + +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qgamepadinput_p.h b/src/input/frontend/qgamepadinput_p.h index c1990030e..c064f1c94 100644 --- a/src/input/frontend/qgamepadinput_p.h +++ b/src/input/frontend/qgamepadinput_p.h @@ -49,6 +49,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgenericinputdevice.cpp b/src/input/frontend/qgenericinputdevice.cpp index 8c4b44992..84a1699fc 100644 --- a/src/input/frontend/qgenericinputdevice.cpp +++ b/src/input/frontend/qgenericinputdevice.cpp @@ -39,7 +39,7 @@ #include "qgenericinputdevice_p.h" -#include "qabstractphysicaldevice_p.h" +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h index f4af03975..b46eada67 100644 --- a/src/input/frontend/qgenericinputdevice_p.h +++ b/src/input/frontend/qgenericinputdevice_p.h @@ -52,6 +52,7 @@ // #include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/private/qt3dinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 5c5fd3b06..8cb5b8be2 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -39,56 +39,57 @@ #include "qinputaspect.h" #include "qinputaspect_p.h" -#include "inputhandler_p.h" -#include "buttonaxisinput_p.h" -#include "keyboarddevice_p.h" -#include "keyboardhandler_p.h" -#include "mousedevice_p.h" -#include "mousehandler_p.h" -#include <Qt3DInput/qkeyboarddevice.h> -#include <Qt3DInput/qkeyboardhandler.h> -#include <Qt3DInput/qmousedevice.h> -#include <Qt3DInput/qmousehandler.h> -#include <Qt3DInput/private/qinputdeviceintegration_p.h> -#include <Qt3DInput/qinputsettings.h> -#include <Qt3DInput/private/qgenericinputdevice_p.h> -#include <Qt3DInput/private/qinputdeviceintegrationfactory_p.h> -#include <Qt3DCore/private/qservicelocator_p.h> -#include <Qt3DCore/private/qeventfilterservice_p.h> -#include <QDir> -#include <QLibrary> -#include <QLibraryInfo> -#include <QPluginLoader> -#include <Qt3DInput/qaxis.h> -#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaction.h> -#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qactioninput.h> #include <Qt3DInput/qanalogaxisinput.h> +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qbuttonaxisinput.h> #include <Qt3DInput/qinputchord.h> #include <Qt3DInput/qinputsequence.h> +#include <Qt3DInput/qinputsettings.h> +#include <Qt3DInput/qkeyboarddevice.h> +#include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p.h> +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmousehandler.h> +#include <QtCore/QDir> +#include <QtCore/QLibrary> +#include <QtCore/QLibraryInfo> +#include <QtCore/QPluginLoader> + +#include <Qt3DInput/private/action_p.h> +#include <Qt3DInput/private/actioninput_p.h> #include <Qt3DInput/private/axis_p.h> #include <Qt3DInput/private/axisaccumulator_p.h> -#include <Qt3DInput/private/action_p.h> +#include <Qt3DInput/private/axisaccumulatorjob_p.h> #include <Qt3DInput/private/axissetting_p.h> -#include <Qt3DInput/private/actioninput_p.h> -#include <Qt3DInput/private/inputchord_p.h> -#include <Qt3DInput/private/inputsequence_p.h> -#include <Qt3DInput/private/logicaldevice_p.h> +#include <Qt3DInput/private/buttonaxisinput_p.h> +#include <Qt3DInput/private/eventsourcesetterhelper_p.h> +#include <Qt3DInput/private/genericdevicebackendnode_p.h> #include <Qt3DInput/private/inputbackendnodefunctor_p.h> +#include <Qt3DInput/private/inputchord_p.h> +#include <Qt3DInput/private/inputhandler_p.h> #include <Qt3DInput/private/inputmanagers_p.h> -#include <Qt3DInput/private/updateaxisactionjob_p.h> -#include <Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h> -#include <Qt3DInput/private/genericdevicebackendnode_p.h> +#include <Qt3DInput/private/inputsequence_p.h> #include <Qt3DInput/private/inputsettings_p.h> -#include <Qt3DInput/private/eventsourcesetterhelper_p.h> +#include <Qt3DInput/private/keyboarddevice_p.h> +#include <Qt3DInput/private/keyboardhandler_p.h> +#include <Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h> #include <Qt3DInput/private/loadproxydevicejob_p.h> -#include <Qt3DInput/private/axisaccumulatorjob_p.h> +#include <Qt3DInput/private/logicaldevice_p.h> +#include <Qt3DInput/private/mousedevice_p.h> +#include <Qt3DInput/private/mousehandler_p.h> +#include <Qt3DInput/private/qabstractphysicaldeviceproxy_p.h> +#include <Qt3DInput/private/qgenericinputdevice_p.h> +#include <Qt3DInput/private/qinputdeviceintegration_p.h> +#include <Qt3DInput/private/qinputdeviceintegrationfactory_p.h> +#include <Qt3DInput/private/updateaxisactionjob_p.h> +#include <Qt3DCore/private/qeventfilterservice_p.h> +#include <Qt3DCore/private/qservicelocator_p.h> #ifdef HAVE_QGAMEPAD # include <Qt3DInput/private/qgamepadinput_p.h> diff --git a/src/input/frontend/qinputaspect_p.h b/src/input/frontend/qinputaspect_p.h index 35a4ffa02..bcdd8d4ed 100644 --- a/src/input/frontend/qinputaspect_p.h +++ b/src/input/frontend/qinputaspect_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qabstractaspect_p.h> +#include <Qt3DCore/private/qabstractaspect_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index 372c61990..7c986f297 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -38,8 +38,9 @@ #include "qinputchord.h" #include "qinputchord_p.h" -#include <Qt3DCore/qnodecreatedchange.h> + #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h index f3e603eb5..1fc69bd1b 100644 --- a/src/input/frontend/qinputchord.h +++ b/src/input/frontend/qinputchord.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QINPUTCHORD_H #define QT3DINPUT_QINPUTCHORD_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputchord_p.h b/src/input/frontend/qinputchord_p.h index bd49f93d6..37cbbd9f2 100644 --- a/src/input/frontend/qinputchord_p.h +++ b/src/input/frontend/qinputchord_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h index 248243fa2..a066d7629 100644 --- a/src/input/frontend/qinputdeviceintegration_p.h +++ b/src/input/frontend/qinputdeviceintegration_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <QObject> #include <Qt3DInput/qt3dinput_global.h> -#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> - #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> +#include <QtCore/QObject> + +#include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceintegration_p_p.h b/src/input/frontend/qinputdeviceintegration_p_p.h index c8557eac5..31eea4cdf 100644 --- a/src/input/frontend/qinputdeviceintegration_p_p.h +++ b/src/input/frontend/qinputdeviceintegration_p_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <private/qobject_p.h> -#include <private/qt3dinput_global_p.h> +#include <Qt3DInput/private/qt3dinput_global_p.h> +#include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp index 22e93294e..052f2d2b2 100644 --- a/src/input/frontend/qinputdeviceintegrationfactory.cpp +++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "qinputdeviceintegrationfactory_p.h" + +#include <QtCore/QCoreApplication> +#include <QtCore/QDir> + #include <Qt3DInput/private/qinputdeviceintegration_p.h> #include <Qt3DInput/private/qinputdeviceplugin_p.h> #include <QtCore/private/qfactoryloader_p.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceplugin_p.h b/src/input/frontend/qinputdeviceplugin_p.h index ca77441af..a2f93eb3f 100644 --- a/src/input/frontend/qinputdeviceplugin_p.h +++ b/src/input/frontend/qinputdeviceplugin_p.h @@ -52,8 +52,8 @@ // #include <QtCore/QObject> -#include <QtCore/QtPlugin> #include <QtCore/QFactoryInterface> +#include <QtCore/QtPlugin> #include <Qt3DInput/private/qt3dinput_global_p.h> diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index 99eff289b..17499b59b 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -38,13 +38,15 @@ #include "qinputsequence.h" #include "qinputsequence_p.h" -#include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/qabstractactioninput.h> -#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h index 2baeb40b8..6e08bc649 100644 --- a/src/input/frontend/qinputsequence.h +++ b/src/input/frontend/qinputsequence.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QINPUTSEQUENCE_H #define QT3DINPUT_QINPUTSEQUENCE_H +#include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <Qt3DInput/qabstractactioninput.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsequence_p.h b/src/input/frontend/qinputsequence_p.h index 3290e4dcc..b2807b2d5 100644 --- a/src/input/frontend/qinputsequence_p.h +++ b/src/input/frontend/qinputsequence_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DInput/private/qabstractactioninput_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DInput/private/qabstractactioninput_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp index 47c835cea..ccc53e47b 100644 --- a/src/input/frontend/qinputsettings.cpp +++ b/src/input/frontend/qinputsettings.cpp @@ -39,6 +39,7 @@ #include "qinputsettings.h" #include "qinputsettings_p.h" + #include <Qt3DCore/qnodecreatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h index 9e0ea7b6b..4f4d746f6 100644 --- a/src/input/frontend/qinputsettings.h +++ b/src/input/frontend/qinputsettings.h @@ -40,8 +40,8 @@ #ifndef QT3DINPUT_QINPUTSETTINGS_H #define QT3DINPUT_QINPUTSETTINGS_H -#include <Qt3DCore/qcomponent.h> #include <Qt3DInput/qt3dinput_global.h> +#include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputsettings_p.h b/src/input/frontend/qinputsettings_p.h index 13757ac0b..584e597ba 100644 --- a/src/input/frontend/qinputsettings_p.h +++ b/src/input/frontend/qinputsettings_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <QtCore/qpointer.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index b2c0975ee..257a5be8c 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -39,10 +39,12 @@ #include "qkeyboarddevice.h" #include "qkeyboarddevice_p.h" -#include "qkeyboardhandler.h" -#include <Qt3DCore/private/qscene_p.h> + +#include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DCore/private/qscene_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboarddevice.h b/src/input/frontend/qkeyboarddevice.h index a86687769..a0baf255e 100644 --- a/src/input/frontend/qkeyboarddevice.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_INPUT_QKEYBOARDDEVICE_H #define QT3DINPUT_INPUT_QKEYBOARDDEVICE_H +#include <Qt3DInput/QKeyboardHandler> #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/qabstractphysicaldevice.h> -#include <Qt3DInput/QKeyboardHandler> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyboarddevice_p.h b/src/input/frontend/qkeyboarddevice_p.h index e05f7549b..8399b061b 100644 --- a/src/input/frontend/qkeyboarddevice_p.h +++ b/src/input/frontend/qkeyboarddevice_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <private/qabstractphysicaldevice_p.h> #include <Qt3DCore/qnodeid.h> #include <QtCore/qhash.h> #include <QtCore/qstring.h> +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index e45609f74..5854a047d 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -39,7 +39,8 @@ #include "qkeyboardhandler.h" #include "qkeyboardhandler_p.h" -#include "qkeyboarddevice.h" + +#include <Qt3DInput/qkeyboarddevice.h> #include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyboardhandler_p.h b/src/input/frontend/qkeyboardhandler_p.h index 339d36d26..9de55f9d0 100644 --- a/src/input/frontend/qkeyboardhandler_p.h +++ b/src/input/frontend/qkeyboardhandler_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qcomponent_p.h> +#include <Qt3DCore/private/qcomponent_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qkeyevent.h b/src/input/frontend/qkeyevent.h index 0978a45e7..23fed5545 100644 --- a/src/input/frontend/qkeyevent.h +++ b/src/input/frontend/qkeyevent.h @@ -40,9 +40,9 @@ #ifndef QT3DINPUT_QKEYEVENT_H #define QT3DINPUT_QKEYEVENT_H -#include <QObject> -#include <QtGui/QKeyEvent> #include <Qt3DInput/qt3dinput_global.h> +#include <QtCore/QObject> +#include <QtGui/QKeyEvent> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 4794431b8..1e7033962 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -39,12 +39,13 @@ #include "qlogicaldevice.h" #include "qlogicaldevice_p.h" -#include <Qt3DInput/qaction.h> -#include <Qt3DInput/qaxis.h> + #include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qaction.h> +#include <Qt3DInput/qaxis.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qlogicaldevice_p.h b/src/input/frontend/qlogicaldevice_p.h index c8940e6b9..e04d238c5 100644 --- a/src/input/frontend/qlogicaldevice_p.h +++ b/src/input/frontend/qlogicaldevice_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp index 744d289f3..b5123533f 100644 --- a/src/input/frontend/qmousedevice.cpp +++ b/src/input/frontend/qmousedevice.cpp @@ -39,8 +39,9 @@ #include "qmousedevice.h" #include "qmousedevice_p.h" -#include <Qt3DInput/qphysicaldevicecreatedchange.h> + #include <Qt3DInput/qmouseevent.h> +#include <Qt3DInput/qphysicaldevicecreatedchange.h> #include <Qt3DCore/qentity.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h index 620c41edc..93ee99256 100644 --- a/src/input/frontend/qmousedevice.h +++ b/src/input/frontend/qmousedevice.h @@ -40,8 +40,8 @@ #ifndef QT3DINPUT_QMOUSEDEVICE_H #define QT3DINPUT_QMOUSEDEVICE_H -#include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/qt3dinput_global.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousedevice_p.h b/src/input/frontend/qmousedevice_p.h index 92718dffa..49c1c6191 100644 --- a/src/input/frontend/qmousedevice_p.h +++ b/src/input/frontend/qmousedevice_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qabstractphysicaldevice_p.h> +#include <Qt3DInput/private/qabstractphysicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h index c1051dc1f..043f1023d 100644 --- a/src/input/frontend/qmouseevent.h +++ b/src/input/frontend/qmouseevent.h @@ -41,9 +41,9 @@ #define QT3DINPUT_QMOUSEEVENT_H #include <Qt3DInput/qt3dinput_global.h> -#include <QObject> +#include <QtCore/QtGlobal> +#include <QtCore/QObject> #include <QtGui/QMouseEvent> -#include <QtGlobal> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 75e68b819..750251be9 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -39,10 +39,11 @@ #include "qmousehandler.h" #include "qmousehandler_p.h" -#include "qmousedevice.h" -#include "qmouseevent.h" + +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmouseevent.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <QTimer> +#include <QtCore/QTimer> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qmousehandler_p.h b/src/input/frontend/qmousehandler_p.h index 2d82ca1ad..bb82334a0 100644 --- a/src/input/frontend/qmousehandler_p.h +++ b/src/input/frontend/qmousehandler_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <private/qcomponent_p.h> #include <Qt3DInput/qmouseevent.h> +#include <Qt3DCore/private/qcomponent_p.h> + QT_BEGIN_NAMESPACE class QTimer; diff --git a/src/input/frontend/qphysicaldevicecreatedchange.cpp b/src/input/frontend/qphysicaldevicecreatedchange.cpp index 17edde76a..2f2452187 100644 --- a/src/input/frontend/qphysicaldevicecreatedchange.cpp +++ b/src/input/frontend/qphysicaldevicecreatedchange.cpp @@ -36,10 +36,12 @@ #include "qphysicaldevicecreatedchange.h" #include "qphysicaldevicecreatedchange_p.h" + #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaxissetting.h> #include <Qt3DCore/qnodeid.h> + QT_BEGIN_NAMESPACE namespace Qt3DInput { |