diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-04-16 10:56:56 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-04-18 10:10:48 +0200 |
| commit | 1a1791abba4e0ce00b84d86a7606ac39d778c334 (patch) | |
| tree | 84388a8413498b08826dc66a06068e9b02b500b2 /src/libs/utils/consoleprocess.cpp | |
| parent | 1526011f32ae5becdedcf4ee55e32bbcf5724bcb (diff) | |
consoleprocess: use empty string as default terminal
Using empty string as default terminal avoids storing a path to
QtCreator resources (which becomes invalid if creator is deleted)
on mac.
Change-Id: I9d5fe9bce38387d82de451652df6be9ec5eb5960
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/libs/utils/consoleprocess.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 630783fa18d..d5430d91d90 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -141,11 +141,11 @@ QString ConsoleProcess::msgCannotExecute(const QString & p, const QString &why) return tr("Cannot execute '%1': %2").arg(p, why); } -QString ConsoleProcess::terminalEmulator(const QSettings *settings) +QString ConsoleProcess::terminalEmulator(const QSettings *settings, bool nonEmpty) { if (settings) { const QString value = settings->value(QLatin1String("General/TerminalEmulator")).toString(); - if (!value.isEmpty()) + if (!nonEmpty || !value.isEmpty()) return value; } return defaultTerminalEmulator(); |