diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-05 10:22:45 +0100 |
| commit | 0619de868110586e8a6561ecbc1d62c80da09501 (patch) | |
| tree | 1a4364a3660f57d5f10ac5a7471d30e3f555c5f4 /src/plugins/qnx | |
| parent | 44886ad65a2226511a6b9a4383189e4ab804e47f (diff) | |
| parent | 26f6cbf8b59dffa7f47b315031b7055ec3421315 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/tools/clangpchmanagerbackend/source/taskscheduler.h
Change-Id: I518adaf647df412887c2a372416634359f09ad2a
Diffstat (limited to 'src/plugins/qnx')
| -rw-r--r-- | src/plugins/qnx/qnxdevicetester.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp index a710210ce3..b1374519d8 100644 --- a/src/plugins/qnx/qnxdevicetester.cpp +++ b/src/plugins/qnx/qnxdevicetester.cpp @@ -130,7 +130,7 @@ void QnxDeviceTester::handleVarRunProcessFinished(const QString &error) m_result = TestFailure; } } else { - emit errorMessage(tr("An error occurred checking that" + emit errorMessage(tr("An error occurred while checking that" " files can be created in /var/run.") + QLatin1Char('\n')); m_result = TestFailure; @@ -162,7 +162,7 @@ void QnxDeviceTester::handleProcessFinished(const QString &error) m_result = TestFailure; } } else { - emit errorMessage(tr("An error occurred checking for %1.").arg(command) + QLatin1Char('\n')); + emit errorMessage(tr("An error occurred while checking for %1.").arg(command) + QLatin1Char('\n')); m_result = TestFailure; } testNextCommand(); |