diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-31 17:21:32 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 13:12:10 +0200 |
commit | 593ee850821dbe9eb7ff139eb2485d814694ca84 (patch) | |
tree | 64e040a6bf6cf2db5ffb6981db319fccc0daf05e | |
parent | 5c7733d5c5564a64468c5fdd5e8bd29cc131784c (diff) | |
download | qtscript-593ee850821dbe9eb7ff139eb2485d814694ca84.tar.gz |
Fix Qt6 buildwip/qt6
Change-Id: I1ee69b3c834c159b994f9a83f7ef36e650b09451
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | examples/script/qsdbg/scriptdebugger.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/script/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp index 62eb721..479c26d 100644 --- a/examples/script/qsdbg/scriptdebugger.cpp +++ b/examples/script/qsdbg/scriptdebugger.cpp @@ -256,13 +256,13 @@ void ScriptDebuggerPrivate::output(const QString &text) void ScriptDebuggerPrivate::message(const QString &text) { - *m_outputStream << text << endl; + *m_outputStream << text << Qt::endl; m_outputStream->flush(); } void ScriptDebuggerPrivate::errorMessage(const QString &text) { - *m_errorStream << text << endl; + *m_errorStream << text << Qt::endl; m_errorStream->flush(); } diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 73a1575..55b1391 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -353,12 +353,12 @@ void tst_QScriptJSTestSuite::configData(TestConfig::Mode mode, const QStringList void tst_QScriptJSTestSuite::writeSkipConfigFile(QTextStream &stream) { - stream << QString::fromLatin1("# testcase | message") << endl; + stream << QString::fromLatin1("# testcase | message") << Qt::endl; } void tst_QScriptJSTestSuite::writeExpectFailConfigFile(QTextStream &stream) { - stream << QString::fromLatin1("# testcase | description | message") << endl; + stream << QString::fromLatin1("# testcase | description | message") << Qt::endl; for (int i = 0; i < expectedFailures.size(); ++i) { const FailureItem &fail = expectedFailures.at(i); if (fail.pathRegExp.pattern().isEmpty()) @@ -368,7 +368,7 @@ void tst_QScriptJSTestSuite::writeExpectFailConfigFile(QTextStream &stream) .arg(escape(fail.description)); if (!fail.message.isEmpty()) stream << QString::fromLatin1(" | %0").arg(escape(fail.message)); - stream << endl; + stream << Qt::endl; } } diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index c27e01e..6b1c14a 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -94,12 +94,12 @@ static QScriptValue qscript_fail(QScriptContext *ctx, QScriptEngine *eng) void tst_QScriptV8TestSuite::writeSkipConfigFile(QTextStream &stream) { - stream << QString::fromLatin1("# testcase | message") << endl; + stream << QString::fromLatin1("# testcase | message") << Qt::endl; } void tst_QScriptV8TestSuite::writeExpectFailConfigFile(QTextStream &stream) { - stream << QString::fromLatin1("# testcase | actual | expected | message") << endl; + stream << QString::fromLatin1("# testcase | actual | expected | message") << Qt::endl; for (int i = 0; i < expectedFailures.size(); ++i) { const ExpectedFailure &fail = expectedFailures.at(i); stream << QString::fromLatin1("%0 | %1 | %2") @@ -108,7 +108,7 @@ void tst_QScriptV8TestSuite::writeExpectFailConfigFile(QTextStream &stream) .arg(escape(fail.expected)); if (!fail.message.isEmpty()) stream << QString::fromLatin1(" | %0").arg(escape(fail.message)); - stream << endl; + stream << Qt::endl; } } |