From 466e9fc0ab3373748f8b60eaf51bff6e175d8b6f Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 26 Apr 2018 09:15:45 +0200
Subject: Make ResolvedProduct::fileTaggers a vector

The value_type is not suitable for QList.

Change-Id: I0810dcf8f2c9977aa3f86ecdbdb02ca6dd51facb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/lib/corelib/language/language.h          | 2 +-
 src/lib/corelib/language/projectresolver.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/corelib/language')

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,
-- 
cgit v1.2.3