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/items/quick3dparameter.cpp | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
| download | qt3d-wip/animation.tar.gz | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/quick3d/quick3drender/items/quick3dparameter.cpp')
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dparameter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 |