From 8ef41d1713036c63510e9900a7b5e752bba485bc Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 11:11:44 +0200
Subject: Use QList instead of QVector in qmake

Task-number: QTBUG-84469
Change-Id: I4a3da94702f1dad1ee10b1ba3c6712b6f40338c9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 qmake/generators/win32/msvc_objectmodel.h | 2 +-
 qmake/generators/win32/msvc_vcproj.cpp    | 2 +-
 qmake/generators/win32/winmakefile.cpp    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'qmake/generators/win32')

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 8793c793ef..67310cc33c 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -958,7 +958,7 @@ public:
     VCCLCompilerTool        CompilerTool;
 };
 
-typedef QVector<VCFilter> VCFilterList;
+typedef QList<VCFilter> VCFilterList;
 class VCProjectSingleConfig
 {
 public:
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index ddb6bf5b4e..477205a7f7 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -355,7 +355,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt
                                                    QHash<QString, ProStringList> &subdirProjectLookup,
                                                    const ProStringList &allDependencies)
 {
-    QVector<QPair<QString, ProStringList> > collectedSubdirs;
+    QList<QPair<QString, ProStringList>> collectedSubdirs;
     ProStringList tmp_proj_subdirs = proj->values("SUBDIRS");
     ProStringList projectsInProject;
     const int numSubdirs = tmp_proj_subdirs.size();
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 0c32be8ef6..422919b872 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -102,7 +102,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
     ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
     if (impexts.isEmpty())
         impexts = project->values("QMAKE_EXTENSION_STATICLIB");
-    QVector<LibrarySearchPath> dirs;
+    QList<LibrarySearchPath> dirs;
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
         dirs.append(LibrarySearchPath(dlib.toQString(), true));
-- 
cgit v1.2.3