diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
commit | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (patch) | |
tree | 071014337919d63a62718ea6979fd48775ad61df /src/testlib | |
parent | 2be7746e0922fa404da567fd0bc0cbc00c6215cb (diff) | |
parent | c204f6e417fe9b10df29e0ba00c7a94e0aa52cef (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4b56ce8c76729d9fc60995564299f8f27336fcde
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qsignalspy.qdoc | 4 | ||||
-rw-r--r-- | src/testlib/qtestblacklist.cpp | 1 | ||||
-rw-r--r-- | src/testlib/qtestlog.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc index 77affc9a4b..3352307d69 100644 --- a/src/testlib/qsignalspy.qdoc +++ b/src/testlib/qsignalspy.qdoc @@ -63,7 +63,7 @@ Constructs a new QSignalSpy that listens for emissions of the \a signal from the QObject \a object. If QSignalSpy is not able to listen for a - valid signal (for example, because \a object is null or \a signal does + valid signal (for example, because \a object is \nullptr or \a signal does not denote a valid signal of \a object), an explanatory warning message will be output using qWarning() and subsequent calls to \c isValid() will return false. @@ -77,7 +77,7 @@ Constructs a new QSignalSpy that listens for emissions of the \a signal from the QObject \a object. If QSignalSpy is not able to listen for a - valid signal (for example, because \a object is null or \a signal does + valid signal (for example, because \a object is \nullptr or \a signal does not denote a valid signal of \a object), an explanatory warning message will be output using qWarning() and subsequent calls to \c isValid() will return false. diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 84a99c10f3..886f1f75b9 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -104,6 +104,7 @@ static QSet<QByteArray> keywords() #endif #ifdef Q_OS_OSX << "osx" + << "macos" #endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) << "windows" diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index d5f22fd3da..32be7f6f10 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -475,6 +475,8 @@ void QTestLog::addBXFail(const char *msg, const char *file, int line) QTEST_ASSERT(msg); QTEST_ASSERT(file); + ++QTest::blacklists; + QTest::TestLoggers::addIncident(QAbstractTestLogger::BlacklistedXFail, msg, file, line); } |