diff options
Diffstat (limited to 'src/quick3d/quick3d')
18 files changed, 47 insertions, 37 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp index ebc92e843..643c0a49d 100644 --- a/src/quick3d/quick3d/items/quick3dentity.cpp +++ b/src/quick3d/quick3d/items/quick3dentity.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "quick3dentity_p.h" + #include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dentity_p.h b/src/quick3d/quick3d/items/quick3dentity_p.h index eb716a0c3..d8b107896 100644 --- a/src/quick3d/quick3d/items/quick3dentity_p.h +++ b/src/quick3d/quick3d/items/quick3dentity_p.h @@ -51,8 +51,9 @@ // We mean it. // -#include <QQmlListProperty> #include <Qt3DCore/qentity.h> +#include <QtQml/QQmlListProperty> + #include <Qt3DQuick/private/quick3dnode_p.h> #include <Qt3DQuick/private/qt3dquick_global_p.h> diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 9c82db7ad..de33f00de 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -39,9 +39,9 @@ #include "quick3dentityloader_p_p.h" -#include <QQmlContext> -#include <QQmlEngine> -#include <QQmlIncubator> +#include <QtQml/QQmlContext> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlIncubator> #include <QtQml/private/qqmlengine_p.h> diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index 5721af115..423d7f81c 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -51,10 +51,9 @@ // We mean it. // -#include <QObject> -#include <QUrl> - #include <Qt3DCore/QEntity> +#include <QtCore/QObject> +#include <QtCore/QUrl> #include <Qt3DQuick/private/qt3dquick_global_p.h> diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h index 235870933..d297ddf6f 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h @@ -51,11 +51,10 @@ // We mean it. // -#include "quick3dentityloader_p.h" - -#include <QQmlComponent> +#include <QtQml/QQmlComponent> #include <Qt3DCore/private/qentity_p.h> +#include <Qt3DQuick/private/quick3dentityloader_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp index 3761f8d64..fb91f4ae0 100644 --- a/src/quick3d/quick3d/items/quick3dnode.cpp +++ b/src/quick3d/quick3d/items/quick3dnode.cpp @@ -38,7 +38,8 @@ ****************************************************************************/ #include "quick3dnode_p.h" -#include <QDebug> + +#include <QtCore/QDebug> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnode_p.h b/src/quick3d/quick3d/items/quick3dnode_p.h index 9798d0d4c..640a58149 100644 --- a/src/quick3d/quick3d/items/quick3dnode_p.h +++ b/src/quick3d/quick3d/items/quick3dnode_p.h @@ -51,8 +51,9 @@ // We mean it. // -#include <QQmlListProperty> #include <Qt3DCore/qnode.h> +#include <QtQml/QQmlListProperty> + #include <Qt3DQuick/private/qt3dquick_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index ce69e471a..5012ce263 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -42,13 +42,13 @@ #include <QtQml/QQmlContext> #include <QtQml/QQmlComponent> -#include <QtQml/QQmlInfo> #include <QtQml/QQmlError> -#include <QtQml/private/qqmlobjectmodel_p.h> +#include <QtQml/QQmlInfo> + +#include <Qt3DCore/private/qnode_p.h> +#include <QtQml/private/qqmlchangeset_p.h> #include <QtQml/private/qqmldelegatemodel_p.h> -#include <private/qnode_p.h> -#include <private/qqmlchangeset_p.h> -#include <private/qqmlobjectmodel_p.h> +#include <QtQml/private/qqmlobjectmodel_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h index d861fc2fe..fd7a1d83d 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h @@ -52,11 +52,12 @@ // We mean it. // -#include <Qt3DQuick/private/qt3dquick_global_p.h> #include <Qt3DCore/qnode.h> #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlparserstatus.h> +#include <Qt3DQuick/private/qt3dquick_global_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp index 4b694d26e..912c71fb3 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.cpp +++ b/src/quick3d/quick3d/qqmlaspectengine.cpp @@ -38,10 +38,11 @@ ****************************************************************************/ #include "qqmlaspectengine_p.h" -#include <QQmlComponent> -#include <QQmlContext> -#include <QDebug> + #include <Qt3DCore/qentity.h> +#include <QtCore/QDebug> +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlContext> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h index c85cbb8ea..a7b09ec8a 100644 --- a/src/quick3d/quick3d/qqmlaspectengine.h +++ b/src/quick3d/quick3d/qqmlaspectengine.h @@ -40,9 +40,9 @@ #ifndef QT3D_QUICK_QQMLASPECTENGINE_H #define QT3D_QUICK_QQMLASPECTENGINE_H -#include <QQmlEngine> #include <Qt3DCore/QAspectEngine> #include <Qt3DQuick/qt3dquick_global.h> +#include <QtQml/QQmlEngine> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qqmlaspectengine_p.h b/src/quick3d/quick3d/qqmlaspectengine_p.h index f9343ae68..960ecb344 100644 --- a/src/quick3d/quick3d/qqmlaspectengine_p.h +++ b/src/quick3d/quick3d/qqmlaspectengine_p.h @@ -53,8 +53,9 @@ #include <Qt3DQuick/qt3dquick_global.h> #include <Qt3DQuick/qqmlaspectengine.h> -#include <private/qobject_p.h> -#include <QScopedPointer> +#include <QtCore/QScopedPointer> + +#include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp index 25cad523b..adccf4d97 100644 --- a/src/quick3d/quick3d/qquaternionanimation.cpp +++ b/src/quick3d/quick3d/qquaternionanimation.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qquaternionanimation_p.h" + #include <QtQuick/private/qquickanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qquaternionanimation_p.h b/src/quick3d/quick3d/qquaternionanimation_p.h index 3c5f092c4..172d3bc85 100644 --- a/src/quick3d/quick3d/qquaternionanimation_p.h +++ b/src/quick3d/quick3d/qquaternionanimation_p.h @@ -51,9 +51,10 @@ // We mean it. // +#include <QtGui/qquaternion.h> + #include <Qt3DQuick/private/qt3dquick_global_p.h> #include <QtQuick/private/qquickanimation_p.h> -#include <QtGui/qquaternion.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index f25aae268..97be0b636 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -38,12 +38,13 @@ ****************************************************************************/ #include "qt3dquick_global_p.h" -#include "qt3dquicknodefactory_p.h" -#include <private/qqmlglobal_p.h> -#include <private/qt3dquickvaluetypes_p.h> -#include <private/qv8engine_p.h> -#include <private/qv4engine_p.h> -#include <private/qv4object_p.h> + +#include <Qt3DQuick/private/qt3dquicknodefactory_p.h> +#include <Qt3DQuick/private/qt3dquickvaluetypes_p.h> +#include <QtQml/private/qqmlglobal_p.h> +#include <QtQml/private/qv4engine_p.h> +#include <QtQml/private/qv4object_p.h> +#include <QtQml/private/qv8engine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp index 923793506..a8c021754 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qt3dquicknodefactory_p.h" + #include <QtQml/private/qqmlmetatype_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h index 4dd455461..6c074da04 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h +++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DCore/private/qabstractnodefactory_p.h> #include <QtCore/qhash.h> +#include <Qt3DCore/private/qabstractnodefactory_p.h> + QT_BEGIN_NAMESPACE class QQmlType; diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index ed80d0426..46500b935 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -52,15 +52,15 @@ // We mean it. // -#include <private/qt3dquick_global_p.h> -#include <private/qqmlvaluetype_p.h> - #include <QtGui/QColor> +#include <QtGui/QMatrix4x4> +#include <QtGui/QQuaternion> #include <QtGui/QVector2D> #include <QtGui/QVector3D> #include <QtGui/QVector4D> -#include <QtGui/QQuaternion> -#include <QtGui/QMatrix4x4> + +#include <Qt3DQuick/private/qt3dquick_global_p.h> +#include <QtQml/private/qqmlvaluetype_p.h> QT_BEGIN_NAMESPACE |