diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2011-11-07 10:58:04 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-11-07 11:01:25 (GMT) |
| commit | 34af6fd31e29334e9ffe5d390d5a8b40c5a4a9c6 (patch) | |
| tree | c02cb70560811bab535401db6d7da5c175600a4f | |
| parent | da8a056dbb0e4b0a65d94857cdd65ddcb8633341 (diff) | |
| download | Qt-34af6fd31e29334e9ffe5d390d5a8b40c5a4a9c6.zip Qt-34af6fd31e29334e9ffe5d390d5a8b40c5a4a9c6.tar.gz Qt-34af6fd31e29334e9ffe5d390d5a8b40c5a4a9c6.tar.bz2 | |
Ensure that the RC_FILE is correctly handled in a single configuration
With MSVC 2010 if a single configuration vcxproj file was created then
it would not have an entry for the .rc file only the .res file that
would be compiled from it. Without the entry for the .rc file then it
would not compile the .res file.
Task-number: QTBUG-22545
Merge-request: 1452
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index c70d966..130f273 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -2896,6 +2896,7 @@ XmlOutput &operator<<(XmlOutput &xml, const VCXProjectSingleConfig &tool) tempProj.outputFilter(xml, xmlFilter, tempProj.ExtraCompilers.at(x)); } + tempProj.outputFilter(xml, xmlFilter, "Root Files"); xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets"); xml << tag("ImportGroup") |