summaryrefslogtreecommitdiffstats
path: root/src/render/frontend
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2016-05-23 15:54:13 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-23 19:21:19 +0000
commit1802f11f4b99c93dc9c2e4b5556592db005b5817 (patch)
tree90bfba77d1606bf0e525358c3feb9ea75893d12e /src/render/frontend
parentc0f13a86ffcc9c19efb6d7be24440f3df2babc23 (diff)
Avoid changing access rights to virtual methods
Added QRenderAspectTester as friend for testing Task-number: QTBUG-53569 Change-Id: Ia7adde188065a2ba02b7fd480fcfe545ccbf4720 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend')
-rw-r--r--src/render/frontend/qrenderaspect.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index 45e982873..c6254da3a 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -55,6 +55,10 @@ class Renderer;
class QRenderAspectPrivate;
+#if defined(QT_BUILD_INTERNAL)
+class QRenderAspectTester;
+#endif
+
class QT3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
{
Q_OBJECT
@@ -68,19 +72,22 @@ public:
explicit QRenderAspect(RenderType type, QObject *parent = nullptr);
~QRenderAspect();
- QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
-
protected:
QRenderAspect(QRenderAspectPrivate &dd, QObject *parent);
Q_DECLARE_PRIVATE(QRenderAspect)
+private:
+ QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+
void onRegistered() Q_DECL_OVERRIDE;
void onUnregistered() Q_DECL_OVERRIDE;
void onEngineStartup() Q_DECL_OVERRIDE;
-private:
friend class Render::Renderer;
+#if defined(QT_BUILD_INTERNAL)
+ friend class QRenderAspectTester;
+#endif
};
}