Merge remote-tracking branch 'origin/9.0' into qds/dev

Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
This commit is contained in:
Tim Jenssen
2022-11-09 12:51:00 +01:00
149 changed files with 89684 additions and 74780 deletions

View File

@@ -311,8 +311,9 @@ void QmlBuildSystem::refresh(RefreshOptions options)
if (!modelManager)
return;
QmlJS::ModelManagerInterface::ProjectInfo projectInfo =
modelManager->defaultProjectInfoForProject(project());
QmlJS::ModelManagerInterface::ProjectInfo projectInfo
= modelManager->defaultProjectInfoForProject(project(),
project()->files(Project::HiddenRccFolders));
const QStringList searchPaths = makeAbsolute(canonicalProjectDir(), customImportPaths());
for (const QString &searchPath : searchPaths)
projectInfo.importPaths.maybeInsert(Utils::FilePath::fromString(searchPath),