diff options
Diffstat (limited to 'src/quick3d/quick3dinput/items')
12 files changed, 26 insertions, 20 deletions
diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp index b3b99e504..33752c6e0 100644 --- a/src/quick3d/quick3dinput/items/quick3daction.cpp +++ b/src/quick3d/quick3dinput/items/quick3daction.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3daction_p.h" +#include <Qt3DQuickInput/private/quick3daction_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3daction_p.h b/src/quick3d/quick3dinput/items/quick3daction_p.h index 8394f9c48..86e52eb33 100644 --- a/src/quick3d/quick3dinput/items/quick3daction_p.h +++ b/src/quick3d/quick3dinput/items/quick3daction_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> #include <Qt3DInput/QAction> #include <Qt3DInput/QAbstractActionInput> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp index 2857e4c48..966aa250d 100644 --- a/src/quick3d/quick3dinput/items/quick3daxis.cpp +++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3daxis_p.h" +#include <Qt3DQuickInput/private/quick3daxis_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h index 400bd5ea0..58ba32ae7 100644 --- a/src/quick3d/quick3dinput/items/quick3daxis_p.h +++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> -#include <Qt3DInput/QAxis> #include <Qt3DInput/QAbstractAxisInput> -#include <QQmlListProperty> +#include <Qt3DInput/QAxis> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp index 0d214a5ec..16a5e8181 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dinputchord_p.h" +#include <Qt3DQuickInput/private/quick3dinputchord_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h index d9759b856..3380fefa4 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h +++ b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> #include <Qt3DInput/qinputchord.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp index 02539443e..4f4eed9d3 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dinputsequence_p.h" +#include <Qt3DQuickInput/private/quick3dinputsequence_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h index ccf872675..aea671f12 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h +++ b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> #include <Qt3DInput/qinputsequence.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp index 72be7e7ac..50218dd25 100644 --- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp +++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dlogicaldevice_p.h" +#include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h index 5b3b36039..050d81ab8 100644 --- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h +++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> #include <Qt3DInput/QAxis> #include <Qt3DInput/QAction> #include <Qt3DInput/QLogicalDevice> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp index ead311135..5c8d55b54 100644 --- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp +++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dphysicaldevice_p.h" +#include <Qt3DQuickInput/private/quick3dphysicaldevice_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h index 9a97d152c..b4c96ac14 100644 --- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h +++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <QObject> -#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> #include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaxissetting.h> -#include <QQmlListProperty> +#include <QtCore/QObject> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickInput/private/qt3dquickinput_global_p.h> QT_BEGIN_NAMESPACE |