diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-01 10:03:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-01 12:58:51 +0000 |
| commit | 823428d994b0ec0f6b85288d74554660a51b2406 (patch) | |
| tree | c0970a406e7b14246c7817628173fef12c1521d1 /src/qml/types | |
| parent | 2cfe1bb09c11432ca5033f9589243e9e62fe9488 (diff) | |
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlobjectmodel_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
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) {} |