diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/doc/src/qttestlib-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/testlib/qplaintestlogger.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qtestelementattribute.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 4125e63ddc..89cf1c19d9 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -672,7 +672,7 @@ In this chapter we will see how to write a simple GUI test. - \section1 Writing a GUI test + \section1 Writing a GUI Test This time, let's assume you want to test the behavior of our QLineEdit class. As before, you will need a class that contains diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 703c6aa54e..e58daa528d 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -202,7 +202,7 @@ namespace QTest { } #if defined(Q_OS_WIN) -Q_CORE_EXPORT bool qWinLogToStderr(); // defined in qlogging.cpp +Q_CORE_EXPORT bool qt_logging_to_console(); // defined in qlogging.cpp #endif void QPlainTestLogger::outputMessage(const char *str) @@ -218,7 +218,7 @@ void QPlainTestLogger::outputMessage(const char *str) if (stream != stdout) #elif defined(Q_OS_WIN) // log to system log only if output is not redirected, and no console is attached - if (!qWinLogToStderr() && stream == stdout) { + if (!qt_logging_to_console() && stream == stdout) { OutputDebugStringA(str); return; } diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index fd9c3b9301..b3b206bfc9 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2640,8 +2640,8 @@ void QTest::ignoreMessage(QtMsgType type, const QRegularExpression &messagePatte #ifdef Q_OS_WIN static inline bool isWindowsBuildDirectory(const QString &dirName) { - return dirName.compare(QStringLiteral("Debug"), Qt::CaseInsensitive) == 0 - || dirName.compare(QStringLiteral("Release"), Qt::CaseInsensitive) == 0; + return dirName.compare(QLatin1String("Debug"), Qt::CaseInsensitive) == 0 + || dirName.compare(QLatin1String("Release"), Qt::CaseInsensitive) == 0; } #endif diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp index c84e8023f3..357902c285 100644 --- a/src/testlib/qtestelementattribute.cpp +++ b/src/testlib/qtestelementattribute.cpp @@ -162,7 +162,7 @@ bool QTestElementAttribute::setPair(QTest::AttributeIndex index, const char *val attributeIndex = index; attributeValue = qstrdup(value); - return (attributeValue!=0) ? true:false; + return attributeValue != 0; } QT_END_NAMESPACE |