diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-19 22:23:32 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-19 22:23:32 +0100 |
| commit | 4e69075dd1f80e16f45f5b282bf494fc7cf256a8 (patch) | |
| tree | 23ea79629eff2a14df264985588637c20909ba71 /src | |
| parent | f1a018c657d98b2e22436a083cc4a6821ea0f0ad (diff) | |
| parent | 0384f29809186e6a45b13760c9dbb2f8cd3bf251 (diff) | |
Merge branch '5.6' into 5.7
Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 2 | ||||
| -rw-r--r-- | src/doc/qt3d.qdocconf | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dbuffer.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/scenemanager.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index ba0920833..f0a7bf757 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -4,7 +4,7 @@ # AssImp expects this to be defined on debug builds CONFIG(debug, debug|release) : DEFINES+=_DEBUG -CONFIG += exceptions +CONFIG += exceptions rtti CONFIG -= precompile_header diff --git a/src/doc/qt3d.qdocconf b/src/doc/qt3d.qdocconf index af44f7e1a..d818ee03f 100644 --- a/src/doc/qt3d.qdocconf +++ b/src/doc/qt3d.qdocconf @@ -4,7 +4,7 @@ project = Qt3D description = Qt 3D Reference Documentation version = $QT_VERSION -examplesinstallpath = qt3d/qt3d +examplesinstallpath = qt3d indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \ $QT_INSTALL_DOCS/qtgui/qtgui.index \ diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp index d2f49de6f..e2a40da78 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp @@ -74,7 +74,7 @@ QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue) char *dataPtr = reinterpret_cast<char *>(typedArray->arrayData()->data()); dataPtr += typedArray->d()->byteOffset; uint byteLength = typedArray->byteLength(); - return QByteArray::fromRawData(dataPtr, byteLength); + return QByteArray(dataPtr, byteLength); } QVariant Quick3DBuffer::bufferData() const diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index 894e6d3db..b46616689 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -SceneManager::SceneManager() : QResourceManager<Scene, +SceneManager::SceneManager() : Qt3DCore::QResourceManager<Scene, Qt3DCore::QNodeId, 8, Qt3DCore::ArrayAllocatingPolicy, |