diff options
| -rw-r--r-- | examples/qt3d/qt3d.pro | 3 | ||||
| -rw-r--r-- | pkg.pri | 21 | ||||
| -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 |
6 files changed, 13 insertions, 19 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index b3f5d91a2..d6d7437d1 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -26,3 +26,6 @@ qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml #SUBDIRS += qt3d qtHaveModule(widgets): SUBDIRS += basicshapes-cpp + +EXAMPLE_FILES += \ + exampleresources @@ -36,14 +36,9 @@ DESTDIR = $$shadowed($$PWD)/bin INSTALLS += copyqmlinfra_install # put all our demos/examples and supporting files into $BUILD_DIR/bin - target_dir = $$DESTDIR/$$resource_dir/qml - # create extra qmake compiler to copy files across during build step - copyqmlinfra.input = QML_INFRA_FILES - copyqmlinfra.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlinfra.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copyqmlinfra.CONFIG += no_link no_clean - copyqmlinfra.variable_out = POST_TARGETDEPS - QMAKE_EXTRA_COMPILERS += copyqmlinfra + copyqmlinfra.files = $$QML_INFRA_FILES + copyqmlinfra.path = $$DESTDIR/$$resource_dir/qml + COPIES += copyqmlinfra } !isEmpty(QML_MESHES_FILES) { @@ -53,11 +48,7 @@ DESTDIR = $$shadowed($$PWD)/bin copyqmlmeshes_install.path = $$target.path/$$resource_dir/qml/meshes INSTALLS += copyqmlmeshes_install - target_dir = $$DESTDIR/$$resource_dir/qml/meshes - copyqmlmeshes.input = QML_MESHES_FILES - copyqmlmeshes.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlmeshes.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copyqmlmeshes.CONFIG += no_link no_clean - copyqmlmeshes.variable_out = POST_TARGETDEPS - QMAKE_EXTRA_COMPILERS += copyqmlmeshes + copyqmlmeshes.files = $$QML_MESHES_FILES + copyqmlmeshes.path = $$DESTDIR/$$resource_dir/qml/meshes + COPIES += copyqmlmeshes } 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, |