diff options
Diffstat (limited to 'src/plugins/autotest/testrunner.cpp')
| -rw-r--r-- | src/plugins/autotest/testrunner.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 6942759947..56973b01df 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -82,14 +82,13 @@ static TestRunner *s_instance = nullptr; TestRunner *TestRunner::instance() { - if (!s_instance) - s_instance = new TestRunner; return s_instance; } -TestRunner::TestRunner(QObject *parent) : - QObject(parent) +TestRunner::TestRunner() { + s_instance = this; + connect(&m_futureWatcher, &QFutureWatcher<TestResultPtr>::resultReadyAt, this, [this](int index) { emit testResultReady(m_futureWatcher.resultAt(index)); }); connect(&m_futureWatcher, &QFutureWatcher<TestResultPtr>::finished, @@ -511,8 +510,8 @@ static void processOutput(TestOutputReader *outputreader, const QString &msg, { QByteArray message = msg.toUtf8(); switch (format) { - case Utils::OutputFormat::StdErrFormatSameLine: - case Utils::OutputFormat::StdOutFormatSameLine: + case Utils::OutputFormat::StdErrFormat: + case Utils::OutputFormat::StdOutFormat: case Utils::OutputFormat::DebugFormat: { static const QByteArray gdbSpecialOut = "Qt: gdb: -nograb added to command-line options.\n" "\t Use the -dograb option to enforce grabbing."; @@ -520,8 +519,8 @@ static void processOutput(TestOutputReader *outputreader, const QString &msg, message = message.mid(gdbSpecialOut.length() + 1); message.chop(1); // all messages have an additional \n at the end - for (auto line : message.split('\n')) { - if (format == Utils::OutputFormat::StdOutFormatSameLine) + for (const auto &line : message.split('\n')) { + if (format == Utils::OutputFormat::StdOutFormat) outputreader->processStdOutput(line); else outputreader->processStdError(line); |