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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangdlocatorfilters.cpp

Change-Id: If91f26625ea9620fb9fdbf45705b32f37cb7f158
This commit is contained in:
Eike Ziller
2023-02-10 10:43:06 +01:00
parent db720d271d 2a2f6afb04
commit 2f5aed6c78
347 changed files with 2409 additions and 13490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -599,8 +599,7 @@ void GenericBuildSystem::updateDeploymentData()
}
if (hasDeploymentData) {
DeploymentData deploymentData;
deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
projectDirectory().toString());
deploymentData.addFilesFromDeploymentFile(deploymentFilePath, projectDirectory());
setDeploymentData(deploymentData);
if (m_deployFileWatcher.filePaths() != FilePaths{deploymentFilePath}) {
m_deployFileWatcher.clear();