diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /src/core/aspects | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'src/core/aspects')
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 25 | ||||
| -rw-r--r-- | src/core/aspects/qaspectengine.cpp | 4 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 73aed25a7..06e241f65 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -57,10 +57,6 @@ static QByteArray className(const QMetaObject &obj) namespace Qt3DCore { -/*! - \class Qt3DCore::QAbstractAspectPrivate - \internal -*/ QAbstractAspectPrivate::QAbstractAspectPrivate() : QObjectPrivate() , m_root(Q_NULLPTR) @@ -84,13 +80,30 @@ QAbstractAspect::QAbstractAspect(QObject *parent) : QObject(*new QAbstractAspectPrivate, parent) { } +/*! + \typedef Qt3DCore::QAspectJobPtr + \relates Qt3DCore::QAbstractAspect + + A shared pointer for QAspectJob. +*/ + +/*! + \typedef Qt3DCore::QBackendNodeFunctorPtr + \relates Qt3DCore::QAbstractAspect -/*! \internal */ + A shared pointer for QBackendNodeFunctor. +*/ + +/*! + \internal +*/ QAbstractAspect::QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent) : QObject(dd, parent) { } - +/*! + Registers backend. +*/ void QAbstractAspect::registerBackendType(const QMetaObject &obj, const QBackendNodeFunctorPtr &functor) { Q_D(QAbstractAspect); diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index ffdc831af..e3fc6c9d2 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -62,10 +62,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -/*! - \class Qt3DCore::QAspectEnginePrivate - \internal -*/ QAspectEnginePrivate::QAspectEnginePrivate() : QObjectPrivate() , m_postman(Q_NULLPTR) |