diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-15 15:01:00 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-16 07:44:38 +0000 |
| commit | 80712e80a3ef5cb2d694d4c52723a031fa18f7a5 (patch) | |
| tree | b9960a916daae649b50c6a8c7055a565321bdf3c /src/libs/utils/consoleprocess_unix.cpp | |
| parent | 17c04dccc0cce33cdc78d6885430229c2c2b1abc (diff) | |
| download | qt-creator-80712e80a3ef5cb2d694d4c52723a031fa18f7a5.tar.gz | |
Utils: Fix process stub look-up.
The path where the tools are located has changed.
Task-number: QTCREATORBUG-14732
Change-Id: Idb404b291ef651d2c0f03bce454b9aa0c0319183
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/libs/utils/consoleprocess_unix.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 15cc2b574e..c70c7e7444 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -151,12 +151,8 @@ bool ConsoleProcess::start(const QString &program, const QString &args) } } - QString stubPath = QCoreApplication::applicationDirPath(); - if (HostOsInfo::isMacHost()) - stubPath.append(QLatin1String("/../Resources/qtcreator_process_stub")); - else - stubPath.append(QLatin1String("/qtcreator_process_stub")); - + const QString stubPath = QCoreApplication::applicationDirPath() + + QLatin1String("/" QTC_REL_TOOLS_PATH "/qtcreator_process_stub"); QStringList allArgs = xtermArgs.toUnixArgs(); allArgs << stubPath << modeOption(d->m_mode) |