diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/quick3d/quick3drender | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/quick3d/quick3drender')
42 files changed, 104 insertions, 85 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp index d36ce8341..362e60328 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp @@ -37,10 +37,10 @@ ** ****************************************************************************/ -#include <QJSValue> -#include <QQmlEngine> +#include <QtQml/QJSValue> +#include <QtQml/QQmlEngine> -#include "quick3dbuffer_p.h" +#include <Qt3DQuickRender/private/quick3dbuffer_p.h> #include <QtQml/private/qqmlengine_p.h> #include <QtQml/private/qjsvalue_p.h> #include <QtQml/private/qv4typedarray_p.h> diff --git a/src/quick3d/quick3drender/items/quick3dbuffer_p.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h index d8dbafcb2..712e11078 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer_p.h +++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/QBuffer> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> + QT_BEGIN_NAMESPACE class QQmlEngine; diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp index 9d4ce934a..fa82c6eff 100644 --- a/src/quick3d/quick3drender/items/quick3deffect.cpp +++ b/src/quick3d/quick3drender/items/quick3deffect.cpp @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#include "quick3deffect_p.h" #include <Qt3DRender/qeffect.h> +#include <Qt3DQuickRender/private/quick3deffect_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h index 50152e2af..3b778563d 100644 --- a/src/quick3d/quick3drender/items/quick3deffect_p.h +++ b/src/quick3d/quick3drender/items/quick3deffect_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <QQmlListProperty> #include <Qt3DRender/qeffect.h> #include <Qt3DRender/qtechnique.h> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp index 84c02d7c9..3f70ea572 100644 --- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp +++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dgeometry_p.h" +#include <Qt3DQuickRender/private/quick3dgeometry_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h index 4c020b0e2..6bf7faf58 100644 --- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h +++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <QQmlListProperty> #include <Qt3DRender/QGeometry> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp index 6f7efcd23..951b4f82f 100644 --- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#include "quick3dlayerfilter_p.h" #include <Qt3DRender/qtexture.h> +#include <Qt3DQuickRender/private/quick3dlayerfilter_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h index b2e7e2d11..f59be2787 100644 --- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qlayerfilter.h> #include <Qt3DRender/qlayer.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp index 50b064bc2..3dfbec83e 100644 --- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#include "quick3dmaterial_p.h" #include <Qt3DRender/qtexture.h> +#include <Qt3DQuickRender/private/quick3dmaterial_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h index 48b60df62..646e3b154 100644 --- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h +++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qmaterial.h> #include <Qt3DRender/qparameter.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp index a899d36c5..0754a0cf5 100644 --- a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp +++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp @@ -55,16 +55,16 @@ Quick3DMemoryBarrier::~Quick3DMemoryBarrier() { } -void Quick3DMemoryBarrier::setBarrierTypesInt(int barrierTypes) +void Quick3DMemoryBarrier::setWaitFor(int barrierTypes) { - QMemoryBarrier::BarrierTypes types(QMemoryBarrier::AllBarrier); + QMemoryBarrier::Operations types(QMemoryBarrier::All); types &= barrierTypes; // Will only keep flags that are actually set - parentBarrier()->setBarrierTypes(types); + parentBarrier()->setWaitOperations(types); } -int Quick3DMemoryBarrier::barrierTypesInt() const +int Quick3DMemoryBarrier::waitFor() const { - return QMemoryBarrier::BarrierTypes::Int(parentBarrier()->barrierTypes()); + return QMemoryBarrier::Operations::Int(parentBarrier()->waitOperations()); } } // namespace Quick diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h index 5e402f006..ab8f72a76 100644 --- a/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h +++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier_p.h @@ -65,15 +65,15 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMemoryBarrier : public QObject { Q_OBJECT - Q_PROPERTY(int barrierTypes READ barrierTypesInt WRITE setBarrierTypesInt) + Q_PROPERTY(int waitFor READ waitFor WRITE setWaitFor) public: explicit Quick3DMemoryBarrier(QObject *parent = nullptr); ~Quick3DMemoryBarrier(); inline QMemoryBarrier *parentBarrier() const { return qobject_cast<QMemoryBarrier*>(parent()); } - void setBarrierTypesInt(int barrierTypes); - int barrierTypesInt() const; + void setWaitFor(int waitOperations); + int waitFor() const; }; } // namespace Quick diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp index 783f152c1..2ef95a4d4 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp @@ -37,10 +37,10 @@ ** ****************************************************************************/ -#include <QJSValue> -#include <QJSValueIterator> +#include <QtQml/QJSValue> +#include <QtQml/QJSValueIterator> -#include "quick3dparameter_p_p.h" +#include <Qt3DQuickRender/private/quick3dparameter_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h index 60493973d..948df22a7 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter_p.h +++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qparameter.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h index 0432642f3..2e680b852 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h +++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h @@ -51,10 +51,10 @@ // We mean it. // -#include "quick3dparameter_p.h" - +#include <Qt3DQuickRender/private/quick3dparameter_p.h> #include <Qt3DRender/private/qparameter_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp index d5f16fab6..7bd50a0d5 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "quick3drenderpass_p.h" +#include <Qt3DQuickRender/private/quick3drenderpass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h index 6ac940e23..c9d2fce59 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h @@ -52,9 +52,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qrenderpass.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp index 8b51a79ef..0a8fa8a3a 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3drenderpassfilter_p.h" +#include <Qt3DQuickRender/private/quick3drenderpassfilter_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h index 3acd32270..cab75f4a6 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <Qt3DQuick/private/quick3dnode_p.h> -#include <Qt3DRender/qrenderpassfilter.h> #include <Qt3DRender/qfilterkey.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuick/private/quick3dnode_p.h> #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <QQmlListProperty> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp index e3b40243a..024789a4c 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3drendertargetoutput_p.h" +#include <Qt3DQuickRender/private/quick3drendertargetoutput_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h index 5a2c8ea54..7626a2db7 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h +++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qrendertarget.h> #include <Qt3DRender/qrendertargetoutput.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp index b61c7ed12..1ace5950a 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3drendertargetselector_p.h" +#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h index a24a6a71f..610ea1a49 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h +++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qrendertargetoutput.h> #include <Qt3DRender/qrendertargetselector.h> -#include <QQmlListProperty> -#include <QVariantList> +#include <QtCore/QVariantList> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp index 4062904f2..af4f44f0e 100644 --- a/src/quick3d/quick3drender/items/quick3dscene.cpp +++ b/src/quick3d/quick3drender/items/quick3dscene.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dscene_p.h" +#include <Qt3DQuickRender/private/quick3dscene_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dscene_p.h b/src/quick3d/quick3drender/items/quick3dscene_p.h index 60c2d2ab5..a7173a6c7 100644 --- a/src/quick3d/quick3drender/items/quick3dscene_p.h +++ b/src/quick3d/quick3drender/items/quick3dscene_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <Qt3DQuick/private/quick3dentity_p.h> #include <Qt3DRender/qsceneloader.h> +#include <Qt3DQuick/private/quick3dentity_p.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp index dbf351695..cd6e2a81e 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp @@ -37,11 +37,11 @@ ** ****************************************************************************/ -#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> -#include <QMetaProperty> +#include <QtCore/QMetaProperty> -#include "quick3dshaderdata_p.h" -#include <private/qshaderdata_p.h> +#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> +#include <Qt3DQuickRender/private/quick3dshaderdata_p.h> +#include <Qt3DRender/private/qshaderdata_p.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ namespace { const int qjsValueTypeId = qMetaTypeId<QJSValue>(); const int quick3DShaderDataArrayTypeId = qMetaTypeId<Quick3DShaderDataArray*>(); -const int quick3DShaderDataTypeId = qMetaTypeId<Quick3DShaderData*>(); +Q_DECL_UNUSED const int quick3DShaderDataTypeId = qMetaTypeId<Quick3DShaderData*>(); } @@ -84,11 +84,9 @@ public: } } return innerValues; - } else if (v.userType() == quick3DShaderDataTypeId) { - Qt3DCore::QNodeId id; - QShaderData *shaderData = v.value<Quick3DShaderData *>(); - if (shaderData) - id = shaderData->id(); + } else if (v.canConvert<Qt3DCore::QNode*>()) { + const auto node = v.value<Qt3DCore::QNode *>(); + const auto id = Qt3DCore::qIdForNode(node); return QVariant::fromValue(id); } return v; diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h index 15e127b78..207096149 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h @@ -51,11 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <Qt3DRender/qshaderdata.h> +#include <QtQml/QJSValue> +#include <QtQml/QJSValueIterator> -#include <QJSValue> -#include <QJSValueIterator> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp index 21dd2525a..9dac7bbc6 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "quick3dshaderdataarray_p.h" -#include <private/qshaderdata_p.h> +#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> +#include <Qt3DRender/private/qshaderdata_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h index 9d33df208..162f402aa 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h @@ -52,9 +52,10 @@ // #include <Qt3DCore/qnode.h> +#include <QtQml/QQmlListProperty> + #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DQuickRender/private/quick3dshaderdata_p.h> -#include <QQmlListProperty> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp index d7d74e5ad..468364493 100644 --- a/src/quick3d/quick3drender/items/quick3dstateset.cpp +++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dstateset_p.h" +#include <Qt3DQuickRender/private/quick3dstateset_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h index 4bb9b6cec..b2e63c066 100644 --- a/src/quick3d/quick3drender/items/quick3dstateset_p.h +++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DRender/qrenderstateset.h> -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp index 123050645..0a15c9f7e 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dtechnique_p.h" +#include <Qt3DQuickRender/private/quick3dtechnique_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h index 203befcb7..9cdfdfefe 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> +#include <QtQml/QQmlListProperty> #include <Qt3DRender/qtechnique.h> -#include <QQmlListProperty> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index b27d46c31..2019093c9 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dtechniquefilter_p.h" +#include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h index 27d637e23..2b10bc108 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h @@ -51,11 +51,12 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <Qt3DRender/qtechniquefilter.h> #include <Qt3DRender/qfilterkey.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <QtQml/QQmlListProperty> + #include <Qt3DQuick/private/quick3dnode_p.h> -#include <QQmlListProperty> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp index 9c528996c..7627a3283 100644 --- a/src/quick3d/quick3drender/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp @@ -37,8 +37,9 @@ ** ****************************************************************************/ -#include "quick3dtexture_p.h" -#include <QDebug> +#include <QtCore/QDebug> + +#include <Qt3DQuickRender/private/quick3dtexture_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h index a1e2ad6b8..6b0430211 100644 --- a/src/quick3d/quick3drender/items/quick3dtexture_p.h +++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h @@ -51,11 +51,11 @@ // We mean it. // -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> -#include <Qt3DQuick/private/quick3dnode_p.h> #include <Qt3DRender/qtexture.h> +#include <QtCore/QUrl> -#include <QUrl> +#include <Qt3DQuick/private/quick3dnode_p.h> +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp index 5d490018f..3b4bf33f5 100644 --- a/src/quick3d/quick3drender/items/quick3dviewport.cpp +++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "quick3dviewport_p.h" +#include <Qt3DQuickRender/private/quick3dviewport_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/items/quick3dviewport_p.h b/src/quick3d/quick3drender/items/quick3dviewport_p.h index 877900365..adf0c983f 100644 --- a/src/quick3d/quick3drender/items/quick3dviewport_p.h +++ b/src/quick3d/quick3drender/items/quick3dviewport_p.h @@ -51,9 +51,10 @@ // We mean it. // +#include <Qt3DRender/qviewport.h> + #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DQuick/private/quick3dnode_p.h> -#include <Qt3DRender/qviewport.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.cpp b/src/quick3d/quick3drender/qt3dquickrender_global.cpp index 0706185fe..bf7d68e71 100644 --- a/src/quick3d/quick3drender/qt3dquickrender_global.cpp +++ b/src/quick3d/quick3drender/qt3dquickrender_global.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include "qt3dquickrender_global_p.h" -#include "qt3dquickrendernodefactory_p.h" +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> +#include <Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp index 2d9456d12..f57451379 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qt3dquickrendernodefactory_p.h" +#include <Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h> #include <QtQml/private/qqmlmetatype_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h index 863a97f0b..6068124e5 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_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; |