Fix post FF API changes

Change-Id: I347f6df41c0a4f2295831e78248669b4a2d6b5ef
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 2 insertions, 12 deletions

diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp
index cbdc83e7d..dfa3f261f 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp
@@ -304,15 +304,6 @@ QVector<Qt3DCore::QEntity*> QScene2D::entities()
 }
 
 /*!
-    Retrieve entities associated with the QScene2D.
- */
-QVector<Qt3DCore::QEntity*> QScene2D::entities() const
-{
-    Q_D(const QScene2D);
-    return d->m_entities;
-}
-
-/*!
     Adds an \a entity to the the QScene2D object. If the entities have QObjectPicker,
     the pick events from that entity are sent to QScene2D and converted to mouse events.
 */
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h
index 2f5c1010e..eab900ca4 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d.h
+++ b/src/quick3d/quick3dscene2d/items/qscene2d.h
@@ -86,8 +86,7 @@ public:
     QQuickItem *item() const;
     bool isMouseEnabled() const;
 
-    Q_DECL_DEPRECATED QVector<Qt3DCore::QEntity *> entities();
-    QVector<Qt3DCore::QEntity *> entities() const;
+    QVector<Qt3DCore::QEntity *> entities();
     void addEntity(Qt3DCore::QEntity *entity);
     void removeEntity(Qt3DCore::QEntity *entity);
 
diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp
index 981b290e2..b8f99ae1b 100644
--- a/src/quick3d/quick3dscene2d/items/scene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp
@@ -193,7 +193,7 @@ void Scene2D::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
     if (id != m_outputId)
         setOutput(id);
 
-    auto ids = Qt3DCore::qIdsForNodes(node->entities());
+    auto ids = Qt3DCore::qIdsForNodes(const_cast<QScene2D *>(node)->entities());
     std::sort(std::begin(ids), std::end(ids));
     Qt3DCore::QNodeIdVector addedEntities;
     Qt3DCore::QNodeIdVector removedEntities;