diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-13 01:01:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-13 10:10:09 +0100 |
| commit | 76be4abbbcfb2fbb14ce532413e0895198e7f0f1 (patch) | |
| tree | 5d6ca9c4425df15a93b6f74dc8e4dbb38db74d91 /src/imports | |
| parent | 587d789fa5929f462b5744ba33a25db6c77b36fc (diff) | |
| parent | 70d726e91e4ef27002b2271805de19077e25809c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/animations/qsequentialanimationgroupjob.cpp
Change-Id: I8b76e509fd7c8599d4cef25181d790ee28edab54
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/toucheventsequence.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/testlib/toucheventsequence.qdoc b/src/imports/testlib/toucheventsequence.qdoc index 6f1f3f8863..bd3551a669 100644 --- a/src/imports/testlib/toucheventsequence.qdoc +++ b/src/imports/testlib/toucheventsequence.qdoc @@ -51,7 +51,7 @@ Events are delivered to the window which contains the item specified in touchEvent. - \sa TestCase::touchEvent(), QTest::QTouchEventSequence + \sa TestCase::touchEvent() */ /*! |