diff options
-rw-r--r-- | dist/changes-5.12.0 | 22 | ||||
-rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 20 | ||||
-rw-r--r-- | src/core/aspects/qaspectengine.cpp | 4 |
3 files changed, 44 insertions, 2 deletions
diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 000000000..a877c37cc --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,22 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://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.0 changes * +**************************************************************************** + + - EntityLoader now also supports loading an Entity from a Component diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index e793eebca..7b08dec81 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -101,6 +101,26 @@ void QAbstractAspectPrivate::unregisterBackendType(const QMetaObject &mo) */ /*! + * \macro QT3D_REGISTER_ASPECT(name, AspectType) + * \relates Qt3DCore::QAbstractAspect + * + * Convenience macro for registering \a AspectType for instantiation by the + * currently set Qt3DCore::QAspectFactory. This makes it possible to create an + * instance of \a AspectType in the aspect thread by later passing \a name to + * Qt3DCore::QAspectEngine::registerAspect(const QString &name). + * + * \note It is also possible to register a new aspect without using this macro + * by instead using Qt3DCore::QAspectEngine::registerAspect(QAbstractAspect *aspect) + * which will handle moving a previously created aspect instance to the aspect + * thread context. + * + * KDAB has published a few articles about writing custom Qt3D aspects + * \l {https://www.kdab.com/writing-custom-qt-3d-aspect/}{on their blog}. These + * provide an excellent starting point if you wish to learn more about it. + */ + + +/*! * Constructs a new QAbstractAspect with \a parent */ QAbstractAspect::QAbstractAspect(QObject *parent) diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index b7a8c84b1..3f219597e 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -274,8 +274,8 @@ void QAspectEnginePrivate::exitSimulationLoop() } /*! - * Registers a new \a aspect to the AspectManager. The QAspectEngine takes - * ownership of the aspect and will delete it when the aspect is unregistered. + Registers a new \a aspect to the AspectManager. The QAspectEngine takes + ownership of the aspect and will delete it when the aspect is unregistered. //! Called in the main thread */ void QAspectEngine::registerAspect(QAbstractAspect *aspect) |