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>

2 files changed, 11 insertions, 6 deletions

diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index 3d7e8b957..e73e2eb2d 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -56,9 +56,8 @@ public:
     explicit QLogicAspect(QObject *parent = nullptr);
     ~QLogicAspect();
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
-
 private:
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
     void onRegistered() Q_DECL_OVERRIDE;
     void onEngineStartup() Q_DECL_OVERRIDE;
 
@@ -71,4 +70,3 @@ private:
 QT_END_NAMESPACE
 
 #endif // QT3DLOGIC_QLOGICASPECT_H
-
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
 };
 
 }