summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dist/changes-5.12.133
-rw-r--r--src/extras/defaults/qmetalroughmaterial.cpp2
-rw-r--r--src/plugins/sceneparsers/assimp/assimpimporter.cpp1
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp2
-rw-r--r--src/quick3d/quick3d/items/quick3dentityloader_p.h2
-rw-r--r--src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h2
-rw-r--r--src/render/io/qsceneloader.cpp2
-rw-r--r--src/render/materialsystem/qshaderdata.cpp4
8 files changed, 42 insertions, 6 deletions
diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1
new file mode 100644
index 000000000..0f6813e10
--- /dev/null
+++ b/dist/changes-5.12.1
@@ -0,0 +1,33 @@
+Qt 5.12.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.12.1 Changes *
+****************************************************************************
+
+ - Fixes to support loading uncompressed HDR textures
+ - Do not set texture layers when target is a 3D texture
+ - Recompute bounding volumes when a geometry buffer changes
+ - Fixes to PBR Metal Rough material on OpenGL ES 3 platforms
+ - Fix ordering of parameters to glDrawArraysInstancedBaseInstance
+ - Initialize texture internal format to NoFormat
+ - Do not send incorrect texture format back to frontend
+ - Fix loading of animation aspect on iOS
+ - Fix for locking in Scene3D rendering loop
+ - Various documentation fixes
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index f52437769..c6913b490 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -167,7 +167,7 @@ void QMetalRoughMaterialPrivate::handleTextureScaleChanged(const QVariant &var)
\inherits Qt3DRender::QMaterial
This material uses an effect with a single render pass approach and performs per fragment
- lighting. Techniques are provided for OpenGL 3 only.
+ lighting. Techniques are provided for OpenGL 3 and OpenGL ES 3.
*/
/*!
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index a9a149c32..a91bc268d 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -533,6 +533,7 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node)
entityNode->addComponent(mesh);
} else {
QEntity *childEntity = QAbstractNodeFactory::createNode<Qt3DCore::QEntity>("QEntity");
+ childEntity->setObjectName(entityNode->objectName() + QLatin1String("_Child") + QString::number(i));
if (material)
childEntity->addComponent(material);
childEntity->addComponent(mesh);
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 59bc0acc8..9493b59ef 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -213,6 +213,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
// Geometry
qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute");
+ qmlRegisterType<Qt3DRender::QAttribute, 10>(uri, 2, 10, "Attribute");
+ qmlRegisterType<Qt3DRender::QAttribute, 11>(uri, 2, 11, "Attribute");
qmlRegisterUncreatableType<Qt3DRender::QBuffer>(uri, 2, 0, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
qmlRegisterUncreatableType<Qt3DRender::QBuffer, 9>(uri, 2, 9, "BufferBase", QStringLiteral("Use Quick3DBuffer in QML"));
qmlRegisterType<Qt3DRender::Render::Quick::Quick3DBuffer>(uri, 2, 0, "Buffer");
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index beb72ba79..611d86cb2 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -76,7 +76,7 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity
Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged)
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
- Q_PROPERTY(QQmlComponent *sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12)
+ Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12)
public:
enum Status {
Null = 0,
diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h
index 83863be20..416a2280d 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject_p.h
@@ -70,7 +70,7 @@ namespace Quick {
class Scene2DManager;
-class Q_AUTOTEST_EXPORT Scene2DSharedObject
+class QT3DQUICKSCENE2DSHARED_EXPORT Scene2DSharedObject
{
public:
Scene2DSharedObject(Scene2DManager *manager);
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index f039933b0..d66fe3080 100644
--- a/src/render/io/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
@@ -114,7 +114,7 @@ namespace Qt3DRender {
SceneLoader internally relies on the use of plugins to support a wide
variety of 3D file formats. \l
- {http://www.assimp.org/main_features_formats.html}{Here} is a list of
+ {http://assimp.sourceforge.net/main_features_formats.html}{Here} is a list of
formats that are supported by Qt3D.
\note this component shouldn't be shared among several Entity instances.
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index a636bc1a8..b70b99846 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -78,7 +78,7 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader)
/*!
\fn Qt3DRender::PropertyReaderInterface::readProperty(const QVariant &v)
- \return the property identifies by \a v
+ \return the property identified by \a v.
*/
/*!
@@ -95,7 +95,7 @@ QShaderData::~QShaderData()
}
/*!
* \brief QShaderData::propertyReader
- * \return PropertyReaderInterfacePtr for this shader data
+ * Returns the PropertyReaderInterfacePtr for this shader data
*/
PropertyReaderInterfacePtr QShaderData::propertyReader() const
{