From 817d02d11385a06e9b964cf7eef4004e112b66d8 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 30 Jun 2014 14:57:42 +0200 Subject: [PATCH] qmljs: fix race in qmljstodoitemsscanner avoid calling ui-only method on the ProjectExplorer::Project, use information cached in ProjectInfo instead. This (as before) does not automatically scans files in qrc. Contents of qrc should most likely be added to ProjectInfo.sourceFiles Task-number: QTCREATORBUG-12556 Change-Id: Ic7f72589cc5bb132ef9d3d03be9d9fc47f1196fd Reviewed-by: Christian Kandeler --- src/plugins/todo/qmljstodoitemsscanner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/todo/qmljstodoitemsscanner.cpp b/src/plugins/todo/qmljstodoitemsscanner.cpp index fd35fd51e60..08a10d03f47 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.cpp +++ b/src/plugins/todo/qmljstodoitemsscanner.cpp @@ -47,7 +47,7 @@ bool QmlJsTodoItemsScanner::shouldProcessFile(const QString &fileName) { QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); foreach (const QmlJS::ModelManagerInterface::ProjectInfo &info, modelManager->projectInfos()) - if (info.project->files(ProjectExplorer::Project::ExcludeGeneratedFiles).contains(fileName)) + if (info.sourceFiles.contains(fileName)) return true; return false;