diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
| commit | 9bd034ea01d01dcc4598c3e3e25e91d0b53a2cda (patch) | |
| tree | 5b7ca3a1477b0d7733a16abcecf85043a88c442d /src/qmlmodels | |
| parent | 707f78086982f15dc4b2d6129f0b983d01cb9626 (diff) | |
| parent | 1d79bef288623fca8c7cc3fc2c49860b6e2abedb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0d32fc5b99f8c9e4acb922fffe4dd5f3c5be553c
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmlinstantiator.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index 3a05bf1689..095b66b379 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -3392,8 +3392,6 @@ void QQmlDelegateModelGroup::move(QQmlV4Function *args) Each index is adjusted for previous changes with all removed items preceding any inserted items. - - The corresponding handler is \c onChanged. */ //============================================================================ diff --git a/src/qmlmodels/qqmlinstantiator.cpp b/src/qmlmodels/qqmlinstantiator.cpp index f9d5762f6e..3a0d746eb6 100644 --- a/src/qmlmodels/qqmlinstantiator.cpp +++ b/src/qmlmodels/qqmlinstantiator.cpp @@ -250,8 +250,6 @@ QQmlInstantiator::~QQmlInstantiator() This signal is emitted when an object is added to the Instantiator. The \a index parameter holds the index which the object has been given, and the \a object parameter holds the \l QtObject that has been added. - - The corresponding handler is \c onObjectAdded. */ /*! @@ -263,8 +261,6 @@ QQmlInstantiator::~QQmlInstantiator() Do not keep a reference to \a object if it was created by this Instantiator, as in these cases it will be deleted shortly after the signal is handled. - - The corresponding handler is \c onObjectRemoved. */ /*! \qmlproperty bool QtQml::Instantiator::active |