diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
| commit | ba05397ad723fa19125eb5ca2f91c7f437b21484 (patch) | |
| tree | e236df3317828f02ec1e8f28d87125bcc286b2d9 /src/qml/types | |
| parent | b2c71d6518143b3d2a9bd3aef1d72ee5929891fc (diff) | |
| parent | 0e64bd96fbf26855a65e38847083dbd2c6bee4ac (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
Change-Id: I7feb9772fc35066f56b7c073482b53ca8c86c70b
Diffstat (limited to 'src/qml/types')
| -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) {} |