diff options
| author | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-08-31 10:19:41 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-08-31 08:18:28 +0000 |
| commit | 5688464a384a6cb1b233bc53a3fa604ae9143dd8 (patch) | |
| tree | ab63d4c0fc0f12b078dbb92dfa4984099c58b99b | |
| parent | 2f4639a95902a51f99f40513dcaa91c836be315d (diff) | |
MSVC2015_64 "internal compiler error" fixesv5.8.0-alpha1
Change-Id: I8b67b6932eca7ada6ac44521b8a1a526eb0553e5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dbuffer.cpp | 5 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dparameter.cpp | 4 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dshaderdata.cpp | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp index 68ac21577..5701adf07 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp @@ -37,9 +37,10 @@ ** ****************************************************************************/ -#include "quick3dbuffer_p.h" -#include <QQmlEngine> #include <QJSValue> +#include <QQmlEngine> + +#include "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/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp index 22b6bba96..783f152c1 100644 --- a/src/quick3d/quick3drender/items/quick3dparameter.cpp +++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp @@ -37,11 +37,11 @@ ** ****************************************************************************/ -#include "quick3dparameter_p_p.h" - #include <QJSValue> #include <QJSValueIterator> +#include "quick3dparameter_p_p.h" + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp index e5901e8fb..dbf351695 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp @@ -37,12 +37,12 @@ ** ****************************************************************************/ -#include "quick3dshaderdata_p.h" -#include <private/qshaderdata_p.h> - #include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> #include <QMetaProperty> +#include "quick3dshaderdata_p.h" +#include <private/qshaderdata_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { |