summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-12-15 09:14:11 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-12-16 16:26:58 +0000
commit1c8480d4fca881846de0afecaf76078a082f5284 (patch)
tree74d9ea671fc2cc34958f15cdc8a2aa752fe15979
parent6663303f14dad462128033d700bdcbc9cc25304f (diff)
Only aspect subclasses register backend types
Also make registerBackendType public on QInputAspect for now since its plugins will also need to register backend types. Change-Id: I7b07162d806b5644daf12f6b22161677f16da38e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/core/aspects/qabstractaspect.h8
-rw-r--r--src/input/frontend/qinputaspect.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 2851ccc6f..ebd043226 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -77,15 +77,15 @@ public:
bool isShuttingDown() const;
- template<class Frontend>
- void registerBackendType(const QBackendNodeFunctorPtr &functor);
- void registerBackendType(const QMetaObject &, const QBackendNodeFunctorPtr &functor);
-
virtual QVariant executeCommand(const QStringList &args);
protected:
QAbstractAspect(QAbstractAspectPrivate &dd, QObject *parent = 0);
+ template<class Frontend>
+ void registerBackendType(const QBackendNodeFunctorPtr &functor);
+ void registerBackendType(const QMetaObject &, const QBackendNodeFunctorPtr &functor);
+
QBackendNode *createBackendNode(QNode *frontend) const Q_DECL_OVERRIDE;
QBackendNode *getBackendNode(QNode *frontend) const;
void clearBackendNode(QNode *frontend) const;
diff --git a/src/input/frontend/qinputaspect.h b/src/input/frontend/qinputaspect.h
index 9d0292c46..3204939d6 100644
--- a/src/input/frontend/qinputaspect.h
+++ b/src/input/frontend/qinputaspect.h
@@ -63,6 +63,8 @@ public:
QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+ using Qt3DCore::QAbstractAspect::registerBackendType;
+
public Q_SLOTS:
void setCamera(Qt3DCore::QCamera *camera);