From 823428d994b0ec0f6b85288d74554660a51b2406 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 1 Dec 2017 10:03:44 +0100 Subject: Restore a temporary QQmlInstanceModel::object() overload The API change in 60d589c broke Qt3D build. Restore a temporary overload to unblock the CI. Change-Id: I4debce4dc4ec7668b75854da3dc7e1813c9c34c5 Reviewed-by: Friedemann Kleint --- src/qml/types/qqmlobjectmodel_p.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qml/types/qqmlobjectmodel_p.h b/src/qml/types/qqmlobjectmodel_p.h index b3cf45ca62..c98fe13a6b 100644 --- a/src/qml/types/qqmlobjectmodel_p.h +++ b/src/qml/types/qqmlobjectmodel_p.h @@ -75,6 +75,7 @@ public: virtual int count() const = 0; virtual bool isValid() const = 0; + QObject *object(int index, bool async) { return object(index, async ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); } virtual QObject *object(int index, QQmlIncubator::IncubationMode incubationMode = QQmlIncubator::AsynchronousIfNested) = 0; virtual ReleaseFlags release(QObject *object) = 0; virtual void cancel(int) {} -- cgit v1.2.3