diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nodes/qcomponent.cpp | 2 | ||||
| -rw-r--r-- | src/core/nodes/qnode.h | 2 | ||||
| -rw-r--r-- | src/core/resources/qresourcemanager_p.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index 60817ac5a..b68c845e5 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -108,7 +108,7 @@ void QComponentPrivate::removeEntity(QEntity *entity) Qt3D::QComponent subclasses are often aggregated in groups that impart useful behavior to the aggregating entity. For example, to have an Entity that gets drawn by the Qt3D renderer aspect, an entity would most likely aggregate - Qt3D::QTransform, Qt3D::QMesh, and Qt3D::QMaterial components. + Qt3D::QTransform, Qt3DRender::QMesh, and Qt3DRender::QMaterial components. \sa Qt3D::QEntity */ diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index cce0cb72c..f65a89515 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -59,7 +59,7 @@ typedef QSharedPointer<QNode> QNodePtr; #define QT3D_QUOTE(str) #str #define QT3D_CLONEABLE(Class) \ - friend class QAbstractNodeFactory; \ + friend class Qt3D::QAbstractNodeFactory; \ QNode *doClone() const Q_DECL_OVERRIDE { \ Class *clone_ = Qt3D::QAbstractNodeFactory::createNode<Class>(QT3D_QUOTE(Class)); \ clone_->copy(this); \ diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index 5afc3607e..2126f1624 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -116,6 +116,7 @@ enum }; #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \ + namespace Qt3D { \ template<> \ struct QResourceInfo<TYPE > \ { \ @@ -123,7 +124,8 @@ enum { \ needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \ }; \ -} +}; \ +} // namespace Qt3D template <int v> struct Int2Type |