diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-12 13:45:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-12 15:12:32 +0000 |
| commit | 520bd458c72f6c1f92290a4153d0cc7a7e58ef1e (patch) | |
| tree | 355c4330c2f201550278f3de7e394c12ff0de295 | |
| parent | d4ff2907162e20e2288357c428b0df88f7396f92 (diff) | |
Revert "Restore a temporary QQmlInstanceModel::object() overload"
This reverts commit 823428d994b0ec0f6b85288d74554660a51b2406. No more
needed after qt3d commit 78f77f80057b1e77c3f47d52de3e0b3f0c5d8d6e that
took the new API into use.
Change-Id: I4acb707cf363a625ae8e90c4560a0d5140cc4011
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/qml/types/qqmlobjectmodel_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/types/qqmlobjectmodel_p.h b/src/qml/types/qqmlobjectmodel_p.h index c98fe13a6b..b3cf45ca62 100644 --- a/src/qml/types/qqmlobjectmodel_p.h +++ b/src/qml/types/qqmlobjectmodel_p.h @@ -75,7 +75,6 @@ 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) {} |