feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix process stub look-up.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2015-07-15 15:01:00 +02:00
parent 17c04dccc0
commit 80712e80a3
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/consoleprocess_unix.cpp
View File

@@ -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)