From fe0b91879b672486ad9581e3fa577b4b32732ecc Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 28 Nov 2016 17:46:22 +0100
Subject: Fix type of VcprojGenerator::extraCompilerOutputs

The values of this hash are strings, not lists of strings.
Enforce this by using the proper type instead of just using a comment.

Change-Id: Id8a13acdceb8f9f8a9a8eaa04e790b1e6cd5faa7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 qmake/generators/win32/msvc_objectmodel.cpp | 6 +++---
 qmake/generators/win32/msvc_vcproj.cpp      | 2 +-
 qmake/generators/win32/msvc_vcproj.h        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'qmake')

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index fb9c4f354d..98d60f4f04 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2260,10 +2260,10 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
     QString inFile = info.file;
 
     // is the extracompiler rule on a file with a built in compiler?
-    const QStringList &objectMappedFile = Project->extraCompilerOutputs[inFile];
+    const QString objectMappedFile = Project->extraCompilerOutputs.value(inFile);
     bool hasBuiltIn = false;
     if (!objectMappedFile.isEmpty()) {
-        hasBuiltIn = Project->hasBuiltinCompiler(objectMappedFile.at(0));
+        hasBuiltIn = Project->hasBuiltinCompiler(objectMappedFile);
 //        qDebug("*** Extra compiler file has object mapped file '%s' => '%s'", qPrintable(inFile), qPrintable(objectMappedFile.join(' ')));
     }
 
@@ -2305,7 +2305,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         // compiler, too bad..
         if (hasBuiltIn) {
             out = inFile;
-            inFile = objectMappedFile.at(0);
+            inFile = objectMappedFile;
         }
 
         // Dependency for the output
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 7b3d7fd160..38e7e96b98 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -889,7 +889,7 @@ void VcprojGenerator::init()
                             QString out = Option::fixPathToTargetOS(replaceExtraCompilerVariables(
                                             compiler_out, file, QString(), NoShell), false);
                             extraCompilerSources[out] += quc.toQString();
-                            extraCompilerOutputs[out] = QStringList(file); // Can only have one
+                            extraCompilerOutputs[out] = file;
                         }
                     }
                 }
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index 9ccd8c2552..39ba2f0900 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -63,7 +63,7 @@ public:
     static bool hasBuiltinCompiler(const QString &file);
 
     QHash<QString, QStringList> extraCompilerSources;
-    QHash<QString, QStringList> extraCompilerOutputs;
+    QHash<QString, QString> extraCompilerOutputs;
     bool usePCH;
     VCProjectWriter *projectWriter;
 
-- 
cgit v1.2.3