diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 10:48:27 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-02 11:15:29 +0100 |
| commit | f7934f67f7ca833182ac288bdcb61e0141dfbd84 (patch) | |
| tree | 09b410ecfc7c8f114e2f994796dc41edf636476a /src/input/frontend/qinputaspect.cpp | |
| parent | 3e664bf438d4a3ab9a5f1633f2db171632b777b8 (diff) | |
| parent | c64df4a307aff064433f57805561cb445c0e285f (diff) | |
Merge branch '5.8' into 5.9
Conflicts:
src/core/jobs/qthreadpooler.cpp
src/core/nodes/qcomponent.cpp
src/core/qpostman.cpp
src/core/qscene_p.h
src/core/services/qservicelocator_p.h
src/input/frontend/qinputaspect.cpp
src/plugins/sceneparsers/assimp/assimpimporter.cpp
src/plugins/sceneparsers/assimp/assimpimporter.h
src/plugins/sceneparsers/gltf/gltfimporter.h
src/plugins/sceneparsers/gltf/gltfio.cpp
src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
src/quick3d/quick3dextras/qt3dquickwindow.cpp
Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
Diffstat (limited to 'src/input/frontend/qinputaspect.cpp')
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 6b912359b..a3bf58f08 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -39,58 +39,60 @@ #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> -#if QT_CONFIG(library) -#include <QLibrary> -#endif -#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> + +#if QT_CONFIG(library) +#include <QtCore/QLibrary> +#endif +#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> |