diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-17 11:49:32 +0000 |
| commit | b420edb0b5e914b83c35a071b371d0759eba4d3d (patch) | |
| tree | e84852a8c44a18fe6aeadf29cba5dcdefe8e9e58 /src/render/io | |
| parent | 24b2599b91c51ae4b7f2c161cf46696bbde67624 (diff) | |
| parent | e9594f27ccad5667ebc27451f87184296c5cd297 (diff) | |
Merge branch '5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
Diffstat (limited to 'src/render/io')
| -rw-r--r-- | src/render/io/qsceneloader.h | 2 | ||||
| -rw-r--r-- | src/render/io/scenemanager.cpp | 8 | ||||
| -rw-r--r-- | src/render/io/scenemanager_p.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index dbfed1a41..c69a4ad98 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -43,7 +43,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> #include <Qt3DRender/qt3drender_global.h> -#include <QUrl> +#include <QtCore/QUrl> QT_BEGIN_NAMESPACE diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index 784751857..cdf8aae87 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -44,10 +44,10 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -SceneManager::SceneManager() : Qt3DCore::QResourceManager<Scene, - Qt3DCore::QNodeId, - 8, - Qt3DCore::ObjectLevelLockingPolicy>() +SceneManager::SceneManager() + : Qt3DCore::QResourceManager<Scene, + Qt3DCore::QNodeId, + Qt3DCore::ObjectLevelLockingPolicy>() , m_service(nullptr) { } diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index fa2350226..624b32499 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -85,7 +85,6 @@ typedef QSharedPointer<SceneDownloader> SceneDownloaderPtr; class Q_AUTOTEST_EXPORT SceneManager : public Qt3DCore::QResourceManager< Scene, Qt3DCore::QNodeId, - 8, Qt3DCore::ObjectLevelLockingPolicy> { public: |