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>

src/libs/utils/consoleprocess_unix.cpp

@@ -151,12 +151,8 @@ bool ConsoleProcess::start(const QString &program, const QString &args)
         }
     }
 
-    QString stubPath = QCoreApplication::applicationDirPath();
+    const QString stubPath = QCoreApplication::applicationDirPath()
-    if (HostOsInfo::isMacHost())
+            + QLatin1String("/" QTC_REL_TOOLS_PATH "/qtcreator_process_stub");
-        stubPath.append(QLatin1String("/../Resources/qtcreator_process_stub"));
-    else
-        stubPath.append(QLatin1String("/qtcreator_process_stub"));
-
     QStringList allArgs = xtermArgs.toUnixArgs();
     allArgs << stubPath
               << modeOption(d->m_mode)

src/libs/utils/utils.pro

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

src/libs/utils/utils.qbs

@@ -1,9 +1,14 @@
 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")