diff options
Diffstat (limited to 'src/lib/corelib/language')
| -rw-r--r-- | src/lib/corelib/language/language.h | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 22331c44a..bbb718026 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -572,7 +572,7 @@ public: std::vector<RulePtr> rules; std::vector<ResolvedProductPtr> dependencies; QHash<ResolvedProductConstPtr, QVariantMap> dependencyParameters; - QList<FileTaggerConstPtr> fileTaggers; + std::vector<FileTaggerConstPtr> fileTaggers; QList<ResolvedModulePtr> modules; QHash<ResolvedModuleConstPtr, QVariantMap> moduleParameters; QList<ResolvedScannerConstPtr> scanners; diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index ff565d3af..248dd468f 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -87,7 +87,7 @@ struct ProjectResolver::ProjectContext { ProjectContext *parentContext = nullptr; ResolvedProjectPtr project; - QList<FileTaggerConstPtr> fileTaggers; + std::vector<FileTaggerConstPtr> fileTaggers; QList<RulePtr> rules; ResolvedModulePtr dummyModule; }; @@ -1277,7 +1277,7 @@ void ProjectResolver::resolveFileTagger(Item *item, ProjectContext *projectConte checkCancelation(); if (!m_evaluator->boolValue(item, StringConstants::conditionProperty())) return; - QList<FileTaggerConstPtr> &fileTaggers = m_productContext + std::vector<FileTaggerConstPtr> &fileTaggers = m_productContext ? m_productContext->product->fileTaggers : projectContext->fileTaggers; const QStringList patterns = m_evaluator->stringListValue(item, |