diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-07-17 12:42:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-17 12:42:04 +0200 |
| commit | e7ea94b6883816b467ba15bf919448503935e302 (patch) | |
| tree | ea13d7c416dc9c8945876780480e3867be7063f1 /src/libs/utils/consoleprocess_unix.cpp | |
| parent | 98a88b0b845dff64b6b68a4dc1e84ca0673a67e0 (diff) | |
| parent | 0c00f44a2d1683926f72a6fcd5eba63f3ed9db8b (diff) | |
| download | qt-creator-e7ea94b6883816b467ba15bf919448503935e302.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/git/gerrit/gerritparameters.cpp
src/plugins/git/gerrit/gerritplugin.h
src/plugins/git/gitclient.cpp
Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
Diffstat (limited to 'src/libs/utils/consoleprocess_unix.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 9c55d970cc..25834ffd83 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -150,7 +150,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args) } QString stubPath = QCoreApplication::applicationDirPath(); - if (Utils::HostOsInfo::isMacHost()) + if (HostOsInfo::isMacHost()) stubPath.append(QLatin1String("/../Resources/qtcreator_process_stub")); else stubPath.append(QLatin1String("/qtcreator_process_stub")); @@ -363,7 +363,7 @@ static const Terminal knownTerminals[] = QString ConsoleProcess::defaultTerminalEmulator() { - if (Utils::HostOsInfo::isMacHost()) { + if (HostOsInfo::isMacHost()) { QString termCmd = QCoreApplication::applicationDirPath() + QLatin1String("/../Resources/scripts/openTerminal.command"); if (QFile(termCmd).exists()) return termCmd.replace(QLatin1Char(' '), QLatin1String("\\ ")); |