diff options
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 13 | ||||
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index fcdea4a0a8..6311128d70 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -1848,7 +1848,7 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml bool fileAdded = false; for (int i = 0; i < project.SingleProjects.count(); ++i) { - VCFilter filter = project.SingleProjects.at(i).filterByName(filtername); + const VCFilter &filter = project.SingleProjects.at(i).filterByName(filtername); if (filter.Config) // only if the filter is not empty if (outputFileConfig(filter, xml, xmlFilter, info.file, fileAdded)) // only add it once. fileAdded = true; @@ -1861,22 +1861,15 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml xmlFilter << closetag(); } -bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, +bool VCXProjectWriter::outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded) { // Clearing each filter tool filter.useCustomBuildTool = false; filter.useCompilerTool = false; filter.CustomBuildTool = VCCustomBuildTool(); - filter.CompilerTool = VCCLCompilerTool(); - - // Unset some default options filter.CustomBuildTool.config = filter.Config; - filter.CompilerTool.BufferSecurityCheck = unset; - filter.CompilerTool.DebugInformationFormat = debugUnknown; - filter.CompilerTool.ExceptionHandling = ehDefault; - filter.CompilerTool.ProgramDataBaseFileName.clear(); - filter.CompilerTool.RuntimeLibrary = rtUnknown; + filter.CompilerTool = VCCLCompilerTool(); filter.CompilerTool.config = filter.Config; bool inBuild = false; diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h index 5ac72a60e7..c44897c96a 100644 --- a/qmake/generators/win32/msbuild_objectmodel.h +++ b/qmake/generators/win32/msbuild_objectmodel.h @@ -174,7 +174,7 @@ 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); - static bool outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded); + static bool outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded); static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName); static QString generateCondition(const VCConfiguration &config); |