feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7' into HEAD

Browse Source 
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
This commit is contained in:
Eike Ziller
2013-04-18 12:54:37 +02:00
parent 17a26e008a 4647cb77d3
commit 55de6a9fb9
14 changed files with 789 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/consoleprocess.cpp
View File

@@ -139,11 +139,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();