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

ProjectExplorer: only use local files for size comparison

Browse Source 
Change-Id: Ifbf218d4e459462ec6a115e69a5f3688642fddda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2022-02-23 08:43:58 +01:00
parent 4af9842a51
commit 22dda4f8a5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -1194,10 +1194,16 @@ Toolchains GccToolChainFactory::autoDetectToolchains(
|| compilerPath.toString().contains("ccache")) { || compilerPath.toString().contains("ccache")) {
existingTcMatches = existingCommand == compilerPath; existingTcMatches = existingCommand == compilerPath;
} else { } else {
existingTcMatches = Environment::systemEnvironment().isSameExecutable( existingTcMatches = Environment::systemEnvironment()
existingCommand.toString(), compilerPath.toString()) .isSameExecutable(existingCommand.toString(),
|| (HostOsInfo::isWindowsHost() && existingCommand.toFileInfo().size() compilerPath.toString());
== compilerPath.toFileInfo().size()); if (!existingTcMatches
&& HostOsInfo::isWindowsHost()
&& !existingCommand.needsDevice()
&& !compilerPath.needsDevice()) {
existingTcMatches = existingCommand.toFileInfo().size()
== compilerPath.toFileInfo().size();
}
} }
if (existingTcMatches) { if (existingTcMatches) {
if (existingTc->typeId() == requiredTypeId && (!checker || checker(existingTc)) if (existingTc->typeId() == requiredTypeId && (!checker || checker(existingTc))