diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 09:42:07 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-25 12:19:25 +0000 |
| commit | e9f0766d12367e7f853901f0e2721ef702555685 (patch) | |
| tree | 19550979567f275d9fd1c814f603899a4ee68a69 /qmake/generators/makefile.cpp | |
| parent | 02af5155283d55f0eac0bec2dc1fd7c074861993 (diff) | |
| parent | 6f5835879141210b386cad710065b644f72049a1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0d1831d987..11b1c8329d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -612,7 +612,7 @@ MakefileGenerator::init() int x; //build up a list of compilers - QList<Compiler> compilers; + QVector<Compiler> compilers; { const char *builtins[] = { "OBJECTS", "SOURCES", "PRECOMPILED_HEADER", 0 }; for(x = 0; builtins[x]; ++x) { |