Skip to content

Commit

Permalink
Restore a temporary QQmlInstanceModel::object() overload
Browse files Browse the repository at this point in the history
The API change in 60d589c broke Qt3D build. Restore a temporary
overload to unblock the CI.

Change-Id: I4debce4dc4ec7668b75854da3dc7e1813c9c34c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
  • Loading branch information
J-P Nurmi authored and FriedemannKleint committed Dec 1, 2017
1 parent 2cfe1bb commit 823428d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/qml/types/qqmlobjectmodel_p.h
Expand Up @@ -75,6 +75,7 @@ class Q_QML_PRIVATE_EXPORT QQmlInstanceModel : public QObject

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) {}
Expand Down

0 comments on commit 823428d

Please sign in to comment.