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

Utils: Make FilePathAspect::setDefaultValue take a QString

Browse Source 
This sets the unexpanded value, so going to a "cooked" FilePath can
at least theoretically break. On the user side it saves a
roundtrip in a few cases, but is more ugly when the input is already
a proper FilePath.

Change-Id: I8a7e8f6d46fcc34c96b55e41d656dca933fbef4e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-17 12:51:13 +02:00
parent 3fa4fa5cf3
commit ec7abcf98c
14 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/terminal/terminalsettings.cpp
View File

@@ -50,16 +50,16 @@ static int defaultFontSize()
return 10;
}
static FilePath defaultShell()
static QString defaultShell()
{
if (HostOsInfo::isWindowsHost())
return FilePath::fromUserInput(qtcEnvironmentVariable("COMSPEC"));
return qtcEnvironmentVariable("COMSPEC");
FilePath defaultShell = FilePath::fromUserInput(qtcEnvironmentVariable("SHELL"));
if (defaultShell.isExecutableFile())
return defaultShell;
return defaultShell.toUserOutput();
return Environment::systemEnvironment().searchInPath("sh");
return Environment::systemEnvironment().searchInPath("sh").toUserOutput();
}
void setupColor(TerminalSettings *settings,