From f2668c6b43a80a83ebdd46407a01af8a0dc6285f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 7 Aug 2018 08:30:07 +0200 Subject: qmake vcxproj generator: Fix extra compilers for single configs For single config mode (no debug_and_release) extra compilers wouldn't get added to the vcxproj file. Single config mode creates a temporary project, and that was incomplete. Multi config mode, on the other hand, directly operates on the "real data" and wasn't affected by this problem. Task-number: QTBUG-69769 Change-Id: I9cd942e43d80adbeac9a3c8fbe1a5766bc9645a0 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msbuild_objectmodel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qmake') diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index e58999bb97..082f357d32 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -557,6 +557,12 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) addFilters(tempProj, xmlFilter, "Deployment Files"); addFilters(tempProj, xmlFilter, "Distribution Files"); + tempProj.ExtraCompilers.reserve(tool.ExtraCompilersFiles.size()); + std::transform(tool.ExtraCompilersFiles.cbegin(), tool.ExtraCompilersFiles.cend(), + std::back_inserter(tempProj.ExtraCompilers), + [] (const VCFilter &filter) { return filter.Name; }); + tempProj.ExtraCompilers.removeDuplicates(); + for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) addFilters(tempProj, xmlFilter, tempProj.ExtraCompilers.at(x)); -- cgit v1.2.3