diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 14:17:40 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 15:07:06 +0000 |
| commit | 417b32815d5d6c45a6c8b4d38b62ca10119d14fd (patch) | |
| tree | 5c910952affff3d376cbe84b7130be9ee7d6a577 /src/render/geometry | |
| parent | 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 (diff) | |
| parent | c9edc164ab165ddd31ef2411be19deb130614e8b (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/animation/backend/handle_types_p.h
src/extras/defaults/qtexturematerial.h
src/render/backend/entity_p.h
src/render/backend/handle_types_p.h
src/render/backend/renderview.cpp
src/render/io/scenemanager.cpp
Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
Diffstat (limited to 'src/render/geometry')
| -rw-r--r-- | src/render/geometry/buffermanager_p.h | 1 | ||||
| -rw-r--r-- | src/render/geometry/geometryrenderermanager_p.h | 1 | ||||
| -rw-r--r-- | src/render/geometry/qbuffer.h | 2 | ||||
| -rw-r--r-- | src/render/geometry/qbufferdatagenerator.h | 2 | ||||
| -rw-r--r-- | src/render/geometry/qgeometryfactory.h | 2 | ||||
| -rw-r--r-- | src/render/geometry/qmesh.h | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h index 4805955bd..df97a5193 100644 --- a/src/render/geometry/buffermanager_p.h +++ b/src/render/geometry/buffermanager_p.h @@ -63,7 +63,6 @@ namespace Render { class Q_AUTOTEST_EXPORT BufferManager : public Qt3DCore::QResourceManager< Buffer, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { public: diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h index e3b313569..becf1bcc1 100644 --- a/src/render/geometry/geometryrenderermanager_p.h +++ b/src/render/geometry/geometryrenderermanager_p.h @@ -63,7 +63,6 @@ namespace Render { class Q_AUTOTEST_EXPORT GeometryRendererManager : public Qt3DCore::QResourceManager< GeometryRenderer, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { public: diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 89b62ab24..7172f3661 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRender/qt3drender_global.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h index 702f396d4..004eb26eb 100644 --- a/src/render/geometry/qbufferdatagenerator.h +++ b/src/render/geometry/qbufferdatagenerator.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qabstractfunctor.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index d5d88a45d..2e4d5c821 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qabstractfunctor.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index fab76a249..51fdab63a 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <QUrl> +#include <QtCore/QUrl> QT_BEGIN_NAMESPACE |