diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:01:22 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:31:34 +0200 |
commit | 2795ac5d5930fa28ea329529c0dd2e515b361531 (patch) | |
tree | 8dd01197f5b71e1eb8e3612b0119764623325803 /src/imports | |
parent | 8f93d3627a9b76bf77896501129990e33a77f32c (diff) | |
parent | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgrenderloop.cpp
Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 2 | ||||
-rw-r--r-- | src/imports/testlib/TestCase.qml | 6 | ||||
-rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index a7d95cc295..02cf125e48 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -563,7 +563,7 @@ The API conforms to the Synchronous API of the HTML5 Web Database API, The \l{Qt Quick Examples - Local Storage}{SQL Local Storage example} demonstrates the basics of using the Offline Storage API. -\section3 Open or create a databaseData +\section3 Open or Create a Database \code import QtQuick.LocalStorage 2.0 as Sql diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 7ff51bb6d6..18af7e0ab0 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -50,7 +50,7 @@ import Qt.test.qtestroot 1.0 \since 4.8 \ingroup qtquicktest - \section1 Introduction to QML test cases + \section1 Introduction to QML Test Cases Test cases are written as JavaScript functions within a TestCase type: @@ -99,7 +99,7 @@ import Qt.test.qtestroot 1.0 once they have all completed. If a test case doesn't need to run (because a precondition has failed), then \l optional can be set to true. - \section1 Data-driven tests + \section1 Data-driven Tests Table data can be provided to a test using a function name that ends with "_data". Alternatively, the \c init_data() function can be used @@ -173,7 +173,7 @@ import Qt.test.qtestroot 1.0 To get the effect of the \c{QBENCHMARK_ONCE} macro, prefix the test function name with "benchmark_once_". - \section1 Simulating keyboard and mouse events + \section1 Simulating Keyboard and Mouse Events The keyPress(), keyRelease(), and keyClick() methods can be used to simulate keyboard events within unit tests. The events are diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 61c8665a14..fc9f73a881 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -693,7 +693,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo populated until the model is loaded. - \section2 Using key XML roles + \section2 Using Key XML Roles You can define certain roles as "keys" so that when reload() is called, the model will only add and refresh data that contains new values for |