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

CMakeProjectManager: Fix path construction of pch files

Browse Source 
This triggered soft asserts in FileUtils::copyIfDifferent() when
opening top-level qt.

Amends 246f33c20d which introduced a unwanted extra .parentDir() call
which removed part of the path.

Change-Id: Id0475a74a589372d37b7ec65d33d3faf6194013c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2023-10-17 16:42:14 +02:00
parent 058a931d27
commit b38c7a452e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -497,10 +497,7 @@ static RawProjectParts generateRawProjectParts(const QFuture<void> &cancelFuture
return si.path.endsWith(ending); return si.path.endsWith(ending);
}).path); }).path);
if (!precompiled_header.isEmpty()) { if (!precompiled_header.isEmpty()) {
if (precompiled_header.toFileInfo().isRelative()) { precompiled_header = sourceDirectory.resolvePath(precompiled_header);
const FilePath parentDir = sourceDirectory.parentDir();
precompiled_header = parentDir.pathAppended(precompiled_header.toString());
}
// Remove the CMake PCH usage command line options in order to avoid the case // Remove the CMake PCH usage command line options in order to avoid the case
// when the build system would produce a .pch/.gch file that would be treated // when the build system would produce a .pch/.gch file that would be treated