Revert "fix vcxproj generation for CONFIG-=flat"

This reverts commit e5a8134765cdc69ba916416166f4d416137e2ffc.
A much simpler fix for QTBUG-41746 is about to follow.

Change-Id: I1eea1785e00b4d7d470108d8dc3272a2af438ef4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h
index a562cc364b..18472b049a 100644
--- a/qmake/generators/win32/msbuild_objectmodel.h
+++ b/qmake/generators/win32/msbuild_objectmodel.h
@@ -57,7 +57,7 @@ public:
     virtual void addElement(const QString &filepath, const VCFilterFile &allInfo) = 0;
     virtual void removeElements()= 0;
     virtual void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName,
-                             VCProject &tool, const QString &filter, const QString &filterId) = 0;
+                             VCProject &tool, const QString &filter) = 0;
     virtual bool hasElements() = 0;
 };
 
@@ -108,7 +108,7 @@ public:
     }
 
     void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName, VCProject &tool,
-                     const QString &filter, const QString &filterId);
+                     const QString &filter);
     bool hasElements() {
         return children.size() != 0;
     }
@@ -149,7 +149,7 @@ public:
     }
 
     void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName, VCProject &proj,
-                     const QString &filter, const QString &filterId);
+                     const QString &filter);
     bool hasElements() {
         return children.size() != 0;
     }
@@ -183,7 +183,8 @@ private:
 
     static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName);
     static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername);
-    static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername, const QString &filterId);
+    static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter,
+                                  const VCFilterFile &info, const QString &filtername);
     static bool outputFileConfig(OutputFilterData *d, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded, bool hasCustomBuildStep);
     static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName);
     static QString generateCondition(const VCConfiguration &config);