diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-27 16:18:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-27 17:42:00 +0200 |
| commit | faa792f3cdf7141004ea83cfc1406fc678520b58 (patch) | |
| tree | 0f3aa3cd15a668f164725362006970b08e96cf79 /src/libs | |
| parent | 09d0ec188996d018b034f9257355218ddb794c90 (diff) | |
| download | qt-creator-faa792f3cdf7141004ea83cfc1406fc678520b58.tar.gz | |
Use absolute path for xterm on Mac and remove unused file.
xterm is (no longer?) in the PATH on Mac, so we need to point to it
directly.
Task-number: QTCREATORBUG-6150
Change-Id: I84202d0ebac1b8875c890116cce960898f65e5f9
Reviewed-on: http://codereview.qt-project.org/5303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index b5e896b9d7..6ae0d62581 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -281,10 +281,8 @@ void ConsoleProcess::stubExited() QString ConsoleProcess::defaultTerminalEmulator() { -// FIXME: enable this once runInTerminal works nicely -#if 0 //def Q_OS_MAC - return QDir::cleanPath(QCoreApplication::applicationDirPath() - + QLatin1String("/../Resources/runInTerminal.command")); +#ifdef Q_OS_MAC + return QLatin1String("/usr/X11/bin/xterm"); #else return QLatin1String("xterm"); #endif |