diff options
author | hjk <hjk@qt.io> | 2019-11-12 10:26:38 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-11-12 10:50:51 +0000 |
commit | 0120e462b268957171d8542b72b0ffb4a8777f7b (patch) | |
tree | 9ea99ff65db51a858ae9747ce8ba03dce1d28cfd /src/tools | |
parent | 817f81cbfd562a45f4be63cee30c46f614021e9f (diff) |
Partial compile fix for current Qt dev and/or Qt 6
This does not cover Utils::MapReduceOption with QVector, and code
that's not compiled on my machine.
Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/buildoutputparser/outputprocessor.cpp | 2 | ||||
-rw-r--r-- | src/tools/valgrindfake/main.cpp | 2 | ||||
-rw-r--r-- | src/tools/valgrindfake/outputgenerator.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/buildoutputparser/outputprocessor.cpp b/src/tools/buildoutputparser/outputprocessor.cpp index 3922d0fc0b..0f5b54a13d 100644 --- a/src/tools/buildoutputparser/outputprocessor.cpp +++ b/src/tools/buildoutputparser/outputprocessor.cpp @@ -86,5 +86,5 @@ void CompilerOutputProcessor::handleTask(const ProjectExplorer::Task &task) *m_ostream << ':' << task.line; *m_ostream << ": "; } - *m_ostream << task.description << endl; + *m_ostream << task.description << Qt::endl; } diff --git a/src/tools/valgrindfake/main.cpp b/src/tools/valgrindfake/main.cpp index cada53e190..10778b25c2 100644 --- a/src/tools/valgrindfake/main.cpp +++ b/src/tools/valgrindfake/main.cpp @@ -36,6 +36,8 @@ using namespace Valgrind::Fake; +using namespace Qt; + QTextStream qerr(stderr); QTextStream qout(stdout); diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp index d851eb1769..bec3570c95 100644 --- a/src/tools/valgrindfake/outputgenerator.cpp +++ b/src/tools/valgrindfake/outputgenerator.cpp @@ -115,7 +115,7 @@ void OutputGenerator::produceRuntimeError() blockingWrite(m_output, "<</GARBAGE = '\"''asdfaqre"); m_output->flush(); } else if (m_wait) { - qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << endl; + qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << Qt::endl; doSleep(1000 * m_wait); } } |