aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/consoleprocess.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2010-09-02 13:39:19 +0200
committerFriedemann Kleint <[email protected]>2010-09-02 13:39:19 +0200
commit6650275e764df8fe5c623e73881b188ea603dc1e (patch)
tree7fc457739039e775aa2d8c59425606de2620b131 /src/libs/utils/consoleprocess.cpp
parenta340cd118ef1765d14df62f8291d2f2c0c2361de (diff)
Debugger/Console stub: Pass on main thread id on Windows.
Introduce private class to utils/ConsoloProcess as not to expose <windows.h> from its header. Task-number: QTCREATORBUG-1020
Diffstat (limited to 'src/libs/utils/consoleprocess.cpp')
-rw-r--r--src/libs/utils/consoleprocess.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 9c7ef9b4ba5..c721cba3cc6 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -66,9 +66,9 @@ QString ConsoleProcess::msgCannotCreateTempDir(const QString & dir, const QStrin
return tr("Cannot create temporary directory '%1': %2").arg(dir, why);
}
-QString ConsoleProcess::msgUnexpectedOutput()
+QString ConsoleProcess::msgUnexpectedOutput(const QByteArray &what)
{
- return tr("Unexpected output from helper program.");
+ return tr("Unexpected output from helper program (%1).").arg(QString::fromAscii(what));
}
QString ConsoleProcess::msgCannotChangeToWorkDir(const QString & dir, const QString &why)