diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/imports | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 8 | ||||
| -rw-r--r-- | src/imports/testlib/SignalSpy.qml | 2 | ||||
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 2 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 32c709830a..7b2884df77 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -415,14 +415,14 @@ QModelIndex QQuickFolderListModel::index(int row, int , const QModelIndex &) con } /*! - \qmlproperty string FolderListModel::folder + \qmlproperty url FolderListModel::folder - The \a folder property holds a URL for the folder that the model is - currently providing. + The \a folder property holds a URL for the folder that the model + currently provides. The value must be a \c file: or \c qrc: URL, or a relative URL. - By default, the value is an invalid URL. + The default value is an invalid URL. */ QUrl QQuickFolderListModel::folder() const { diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml index 85908091a0..52ed83e261 100644 --- a/src/imports/testlib/SignalSpy.qml +++ b/src/imports/testlib/SignalSpy.qml @@ -43,7 +43,7 @@ import QtTest 1.1 /*! \qmltype SignalSpy \inqmlmodule QtTest - \brief Enables introspection of signal emission + \brief Enables introspection of signal emission. \since 4.8 \ingroup qtquicktest diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index e1dee1e74d..535e29ee70 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -46,7 +46,7 @@ import Qt.test.qtestroot 1.0 /*! \qmltype TestCase \inqmlmodule QtTest - \brief Represents a unit test case + \brief Represents a unit test case. \since 4.8 \ingroup qtquicktest diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index dbfdd5cfb4..df0881092b 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -92,7 +92,7 @@ typedef QPair<int, int> QQuickXmlListRange; \qmltype XmlRole \instantiates QQuickXmlListModelRole \inqmlmodule QtQuick.XmlListModel - \brief For specifying a role to an XmlListModel + \brief For specifying a role to an XmlListModel. \ingroup qtquick-models \sa {Qt QML} @@ -628,7 +628,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo \qmltype XmlListModel \instantiates QQuickXmlListModel \inqmlmodule QtQuick.XmlListModel - \brief For specifying a read-only model using XPath expressions + \brief For specifying a read-only model using XPath expressions. \ingroup qtquick-models |