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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Idbf5f641aa9db7574cf2a4bd09adb8bcd03da894
This commit is contained in:
David Schulz
2023-08-22 08:10:48 +02:00
parent 4e0c4b0f23 64b852e186
commit 5122d8addc
15 changed files with 206 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/3rdparty/libptyqt/unixptyprocess.cpp vendored
View File

@@ -184,29 +184,10 @@ bool UnixPtyProcess::startProcess(const QString &shellPath,
m_readMasterNotify->disconnect();
});
const QStringList defaultVars = {
"TERM=xterm-256color",
"ITERM_PROFILE=Default",
"XPC_FLAGS=0x0",
"XPC_SERVICE_NAME=0",
"LANG=en_US.UTF-8",
"LC_ALL=en_US.UTF-8",
"LC_CTYPE=UTF-8",
"INIT_CWD=" + QCoreApplication::applicationDirPath(),
"COMMAND_MODE=unix2003",
"COLORTERM=truecolor"
};
QStringList varNames;
for (const QString &line : std::as_const(environment))
varNames.append(line.split("=").first());
//append default env vars only if they don't exists in current env
for (const QString &defVar : defaultVars) {
if (!varNames.contains(defVar.split("=").first()))
environment.append(defVar);
}
QProcessEnvironment envFormat;
for (const QString &line : std::as_const(environment))
envFormat.insert(line.split("=").first(), line.split("=").last());