diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-15 16:40:38 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-15 16:44:16 +0100 |
commit | b7a8b5a284bdf306a45b11e1c5ce308be007d1de (patch) | |
tree | 35ebcf4b3440abb24df67b579e00847417d42c19 /src/imports | |
parent | 441e6bbdb01733c0f9860ce881b61f5907d2d2f8 (diff) | |
parent | 365a3ac6ae50eb53253eca92bfdf4c527b3a5c05 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/qml/jsruntime/qv4string.cpp
The conflict resolution for qv4tsring.cpp is to essentially omit the
change of commit 64714ea431f2fd355ed27edc69dba4e992511e75 as the code in
5.8 already uses the add/mul_overflow functions.
This merge also reverts commit f4ac007f4a19bc095ff15d415a6629986de78e49
as we can deal with dead store elimination now.
Change-Id: Iee08c87cbe1a2ff23a73ce621d56262b4e007c56
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/testlib/TestCase.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 683200a259..d22ec7c44f 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -221,7 +221,7 @@ Item { \qmlproperty string TestCase::name This property defines the name of the test case for result reporting. - The default is the empty string. + The default value is an empty string. \code TestCase { @@ -835,7 +835,7 @@ Item { \c{QEXPECT_FAIL(tag, message, Abort)} in C++. If the test is not data-driven, then \a tag must be set to - the empty string. + an empty string. \sa expectFailContinue() */ @@ -861,7 +861,7 @@ Item { \c{QEXPECT_FAIL(tag, message, Continue)} in C++. If the test is not data-driven, then \a tag must be set to - the empty string. + an empty string. \sa expectFail() */ |