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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Change-Id: I5e6cfc111941f9609285e1b802121644fa8cdaac
This commit is contained in:
Orgad Shaneh
2022-10-18 21:59:53 +03:00
parent f1fc14acc9 ada6989079
commit 7edf743583
22 changed files with 113 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -113,7 +113,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
auto addAppDir = [&baseDir, &projectInfo](const FilePath &mdir) {
auto dir = mdir.cleanPath();
if (!baseDir.path().isEmpty()) {
auto rDir = dir.relativePath(baseDir);
auto rDir = dir.relativePathFrom(baseDir);
// do not add directories outside the build directory
// this might happen for example when we think an executable path belongs to
// a bundle, and we need to remove extra directories, but that was not the case