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

QmakeProFile: Fix parsing include paths of remote projects

Browse Source 
QtCreator mistakenly dropped most of the include paths of QMake projects
located on remote devices (e.g. docker as a build device && project
opened via "File" -> "Open from device..."). Those are used for code
model generation and later for clangd project parsing and syntax
highlighting.

Used Utils::FilePath instead of IoUtils to check paths so that device
info is not ignored. Recovered lost device info for remote paths using
buildDir.

Change-Id: Ic8959e36e3bbaa07aec2d3d73c5e6716f67b7f02
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
faust747
2025-06-11 16:59:37 +03:00
committed by Stanislav Polukhanov
parent 9c4579247e
commit bd788ae034
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -28,6 +28,7 @@
#include <utils/algorithm.h>
#include <utils/async.h>
#include <utils/filepath.h>
#include <utils/filesystemwatcher.h>
#include <utils/fileutils.h>
#include <utils/mimeconstants.h>
@@ -1829,8 +1830,24 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F
// These paths should not be checked for existence, to ensure consistent include path lists
// before and after building.
const QString mocDir = mocDirPath(reader, buildDir);
const QString uiDir = uiDirPath(reader, buildDir);
const FilePath mocDir = FilePath::fromString(mocDirPath(reader, buildDir));
const FilePath uiDir = FilePath::fromString(uiDirPath(reader, buildDir));
/* We need to make a full valid Utils::FilePath to make sure that remote paths are compared
* correctly. E.g. we may need to compare paths:
* "/C/Users/Admin/DEV/project/build"
* and
* "C:/__qtc_devices__/docker/builder_container.latest/C/Users/Admin/DEV/project/build"
* Due to buildDir being remote we are sure that the first path of these two must have the same
* device but it does not. In such cases device from buildDir is added to the path.
*/
auto createFullFilePath = [&buildDir](QString path) ->FilePath {
FilePath result = FilePath::fromString(path);
if (!buildDir.isLocal() && result.isLocal()){
result.setParts(buildDir.scheme(), buildDir.host(), result.path());
}
return result;
};
const QList<ProFileEvaluator::SourceFile> elList = reader->fixifiedValues(
QLatin1String("INCLUDEPATH"), projectDir, buildDir.path(), false);
@@ -1838,9 +1855,10 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F
const QString sysrootifiedPath = sysrootify(el.fileName, sysroot.path(),
projectDir,
buildDir.path());
if (IoUtils::isAbsolutePath({}, sysrootifiedPath)
&& (IoUtils::exists({}, sysrootifiedPath) || sysrootifiedPath == mocDir
|| sysrootifiedPath == uiDir)) {
const FilePath sysrootifiedFilePath = createFullFilePath(sysrootifiedPath);
if (sysrootifiedFilePath.isAbsolutePath()
&& (sysrootifiedFilePath.exists() || sysrootifiedFilePath == mocDir
|| sysrootifiedFilePath == uiDir)) {
paths << sysrootifiedPath;
} else {
tryUnfixified = true;
@@ -1854,7 +1872,8 @@ QStringList QmakeProFile::includePaths(QtSupport::ProFileReader *reader, const F
for (const QString &p : rawValues) {
const QString sysrootifiedPath = sysrootify(QDir::cleanPath(p), sysroot.toUrlishString(),
projectDir, buildDir.toUrlishString());
if (IoUtils::isAbsolutePath({}, sysrootifiedPath) && IoUtils::exists({}, sysrootifiedPath))
const FilePath sysrootifiedFilePath = createFullFilePath(sysrootifiedPath);
if (sysrootifiedFilePath.isAbsolutePath() && sysrootifiedFilePath.exists())
paths << sysrootifiedPath;
}
}