From 1ed3298ae2b42f7d3a10801bcc16a9837874090a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 11 Mar 2009 16:07:49 +0100
Subject: [PATCH] Fixes: Correct path for qtcreator_process_stub on Mac
RevBy: Ossi
---
src/libs/utils/consoleprocess_unix.cpp | 7 ++++++-
src/libs/utils/process_stub.pro | 9 ++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index 61008237785..2e20ac0c37a 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -73,7 +73,12 @@ bool ConsoleProcess::start(const QString &program, const QStringList &args)
}
QStringList xtermArgs;
- xtermArgs << "-e" << (QCoreApplication::applicationDirPath() + "/qtcreator_process_stub")
+ xtermArgs << "-e"
+#ifdef Q_OS_MAC
+ << (QCoreApplication::applicationDirPath() + "/../Resources/qtcreator_process_stub")
+#else
+ << (QCoreApplication::applicationDirPath() + "/qtcreator_process_stub")
+#endif
<< (m_debug ? "debug" : "exec")
<< m_stubServer.fullServerName()
<< tr("Press <RETURN> to close this window...")
diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro
index accf024ed0f..a7f48846a4f 100644
--- a/src/libs/utils/process_stub.pro
+++ b/src/libs/utils/process_stub.pro
@@ -1,6 +1,13 @@
+IDE_BUILD_TREE=../../../
+include(../../qworkbench.pri)
+
TEMPLATE = app
TARGET = qtcreator_process_stub
-DESTDIR = ../../../bin
+macx {
+ DESTDIR = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
+} else {
+ DESTDIR = ../../../bin
+}
CONFIG += warn_on console use_c_linker
CONFIG -= qt app_bundle
--
GitLab