From 8b64f9336255fa17f1b8e5f337d0e79765512150 Mon Sep 17 00:00:00 2001 From: Andrew Patterson Date: Wed, 4 Jan 2017 15:29:16 -0500 Subject: [PATCH] Ensure that RC_FILE is correctly handled in a single configuration When generating the Visual Studio project XML, the filter "Root Files" was not being output. Specifically, this means that even if RC_FILE was specified, it would not be included properly as a resource compilation target in the resultant Visual Studio project file. This is essentially a rather belated cherry-pick of qt/d6de960b7f. Task-number: QTBUG-57914 Change-Id: I7d03dc818df0cf36608012f1a71a3a476d8a9ff7 Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msbuild_objectmodel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index e42b823598c..9cc125d3967 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -587,6 +587,8 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) outputFilter(tempProj, xml, xmlFilter, tempProj.ExtraCompilers.at(x)); } + outputFilter(tempProj, xml, xmlFilter, "Root Files"); + xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets"); xml << tag("ImportGroup")