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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I366a1a0e378811dfc9b4e6f42ec96426dbb15356
This commit is contained in:
Eike Ziller
2021-11-15 13:14:24 +01:00
parent b5e935948a cb2291bb57
commit ff5bfe6f0f
81 changed files with 653 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/autotest/testconfiguration.cpp
View File

@@ -83,21 +83,9 @@ FilePath ITestConfiguration::executableFilePath() const
if (!hasExecutable())
return {};
if (m_runnable.command.executable().isExecutableFile() && m_runnable.command.executable().path() != ".") {
return m_runnable.command.executable().absoluteFilePath();
} else if (m_runnable.command.executable().path() == "."){
QString fullCommandFileName = m_runnable.command.executable().toString();
// TODO: check if we can use searchInPath() from Utils::Environment
const QStringList &pathList = m_runnable.environment.toProcessEnvironment().value("PATH")
.split(HostOsInfo::pathListSeparator());
for (const QString &path : pathList) {
QString filePath(path + QDir::separator() + fullCommandFileName);
if (QFileInfo(filePath).isExecutable())
return m_runnable.command.executable().absoluteFilePath();
}
}
return {};
const Environment env = m_runnable.environment.size() == 0 ? Environment::systemEnvironment()
: m_runnable.environment;
return env.searchInPath(m_runnable.command.executable().path());
}
Environment ITestConfiguration::filteredEnvironment(const Environment &original) const