Commit 80712e80 authored by Christian Kandeler's avatar Christian Kandeler

Utils: Fix process stub look-up.

The path where the tools are located has changed.

Task-number: QTCREATORBUG-14732
Change-Id: Idb404b291ef651d2c0f03bce454b9aa0c0319183
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
parent 17c04dcc
......@@ -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)
......
......@@ -6,3 +6,5 @@ include(utils-lib.pri)
win32: LIBS += -luser32 -lshell32
# PortsGatherer
win32: LIBS += -liphlpapi -lws2_32
DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")
import qbs 1.0
import qbs.FileInfo
QtcLibrary {
name: "Utils"
cpp.defines: base.concat("QTCREATOR_UTILS_LIB")
cpp.defines: base.concat([
"QTCREATOR_UTILS_LIB",
"QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath(project.ide_bin_path,
project.ide_libexec_path) + "\""
])
Properties {
condition: qbs.targetOS.contains("windows")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment