diff options
author | Paul Wicking <paul.wicking@qt.io> | 2018-09-27 16:07:34 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2018-10-01 10:01:00 +0000 |
commit | 91bde278ea2e883b4a46cafb1afc1781c71c1590 (patch) | |
tree | ead666ba943561e27fe7147ddf163b320d674f7f /src/qml | |
parent | e8b01250fdbef269379df8c2481c9482317e8220 (diff) |
Doc: Fix QDoc warnings
Change-Id: I19545953bde10d4ccc2f37843dcda2569dc77df4
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmldelegatecomponent.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 4aa7c4b45d..b5eadf483a 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -545,7 +545,7 @@ static QUrl moduleUrlForFileName(const QString &fileName) Subsequent imports of the same module will return the previously imported instance. Modules are singletons and remain around until the engine is destroyed. - The specified \a fileName will internally be normalized using \a QFileInfo::canonicalFilePath(). + The specified \a fileName will internally be normalized using \l QFileInfo::canonicalFilePath(). That means that multiple imports of the same file on disk using different relative paths will load the file only once. diff --git a/src/qml/types/qqmldelegatecomponent.cpp b/src/qml/types/qqmldelegatecomponent.cpp index fa7e994afd..007e8e2ec6 100644 --- a/src/qml/types/qqmldelegatecomponent.cpp +++ b/src/qml/types/qqmldelegatecomponent.cpp @@ -75,7 +75,7 @@ QVariant QQmlAbstractDelegateComponent::value(QQmlAdaptorModel *adaptorModel, in \qmltype DelegateChoice \instantiates QQmlDelegateChoice \inqmlmodule Qt.labs.qmlmodels - \brief Encapsulates a delegate and when to use it + \brief Encapsulates a delegate and when to use it. The DelegateChoice type wraps a delegate and defines the circumstances in which it should be chosen. |