diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:53:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:53:18 +0100 |
| commit | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (patch) | |
| tree | 26da932a85bd80c486a1adc6621aa1427b80a968 | |
| parent | f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 (diff) | |
| parent | a0496abe3890766638e8601c4bd11ba1755138e3 (diff) | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: Iceeaa61ed0526088202ed81216f6fbebe6f9dcd5
| -rw-r--r-- | dist/changes-5.12.1 | 33 | ||||
| -rw-r--r-- | src/quick3d/quick3d/items/quick3dentityloader_p.h | 2 |
2 files changed, 34 insertions, 1 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/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, |