diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
| commit | c80eb38354854f2ccc7ea070a9857409acc36792 (patch) | |
| tree | 806cb68b337ac7c8ab8f9a48538e6e0211f57ed8 /src/imports/folderlistmodel/qquickfolderlistmodel.cpp | |
| parent | d38bac596946c3dd9cce3c0b4127509421dc917d (diff) | |
| parent | f19ec4561b4975d68290593b599d3c38d0f9f6d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/qquicktableview.cpp
Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Diffstat (limited to 'src/imports/folderlistmodel/qquickfolderlistmodel.cpp')
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 49836ad10c..6b76d63555 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -856,7 +856,7 @@ QQuickFolderListModel::Status QQuickFolderListModel::status() const \qmlproperty bool FolderListModel::sortCaseSensitive \since 5.12 - If set to true, the sort is case sensitive. This property is true by default. + If set to \c true, the sort is case sensitive. This property is \c true by default. */ bool QQuickFolderListModel::sortCaseSensitive() const @@ -878,8 +878,8 @@ void QQuickFolderListModel::setSortCaseSensitive(bool on) /*! \qmlmethod var FolderListModel::get(int index, string property) - Get the folder property for the given index. The following properties - are available. + Returns the folder \a property for the given \a index. The following properties + are available: \list \li \c fileName @@ -906,7 +906,7 @@ QVariant QQuickFolderListModel::get(int idx, const QString &property) const \qmlmethod int FolderListModel::indexOf(url file) \since 5.6 - Get the index of the given file URL if the model contains it, + Returns the index of the given \a file URL if the model contains it, or -1 if not. */ int QQuickFolderListModel::indexOf(const QUrl &file) const |