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

Merge remote-tracking branch 'origin/4.10' into 4.11

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/projectexplorer/deploymentdata.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I64c304fc71435629a6a0060a9df71e8952699508
This commit is contained in:
Eike Ziller
2019-10-16 13:23:00 +02:00
parent e90a48e639 e2e96cab52
commit fcb12a275f
13 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/deploymentdata.cpp
View File

@@ -57,8 +57,15 @@ void DeploymentData::addFile(const QString &localFilePath, const QString &remote
DeployableFile DeploymentData::deployableForLocalFile(const Utils::FilePath &localFilePath) const
{
return Utils::findOrDefault(m_files,
Utils::equal(&DeployableFile::localFilePath, localFilePath));
const DeployableFile f = Utils::findOrDefault(m_files,
Utils::equal(&DeployableFile::localFilePath,
localFilePath));
if (f.isValid())
return f;
const QString localFileName = localFilePath.fileName();
return Utils::findOrDefault(m_files, [&localFileName](const DeployableFile &d) {
return d.localFilePath().fileName() == localFileName;
});
}
bool DeploymentData::operator==(const DeploymentData &other) const