diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-02-08 14:00:16 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-08 14:00:16 +0000 |
commit | 319b5059d6b6ae3eaebfd302cfa7080ac77eef82 (patch) | |
tree | 141448b9cbca6a69c2df4ec511adb71e164e4385 /src/imports | |
parent | b2739825454ba7585170d15c83de729b0af6c29a (diff) | |
parent | 34ff69fba1cc017e5a26e5f79ffcd4ac6945061f (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports')
-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 b2abf97898..b3c1de6cc9 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -224,7 +224,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) } /*! - \qmlmodule Qt.labs.folderlistmodel 2.1 + \qmlmodule Qt.labs.folderlistmodel 2.11 \title Qt Labs FolderListModel QML Types \ingroup qmlmodules \brief The FolderListModel provides a model of the contents of a file system folder. @@ -232,7 +232,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) To use this module, import the module with the following line: \code - import Qt.labs.folderlistmodel 2.1 + import Qt.labs.folderlistmodel 2.11 \endcode */ @@ -251,7 +251,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) \e{Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} - \b{import Qt.labs.folderlistmodel 2.1} + \b{import Qt.labs.folderlistmodel 2.11} The \l folder property specifies the folder to access. Information about the files and directories in the folder is supplied via the model's interface. @@ -297,7 +297,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) \qml import QtQuick 2.0 - import Qt.labs.folderlistmodel 2.1 + import Qt.labs.folderlistmodel 2.11 ListView { width: 200; height: 400 |