diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-02-03 23:28:12 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 00:09:20 (GMT) |
| commit | d6de960b7fef462404fbf9770c7106b220e24ef1 (patch) | |
| tree | 4614136a54af14d023b529ed1ab7a9f9bf6d0885 | |
| parent | cdc21e982d11ad90b30c0db5a90bd7a62b961e29 (diff) | |
| download | Qt-d6de960b7fef462404fbf9770c7106b220e24ef1.zip Qt-d6de960b7fef462404fbf9770c7106b220e24ef1.tar.gz Qt-d6de960b7fef462404fbf9770c7106b220e24ef1.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
Change-Id: Ieb77530ca53c7e76056c18542a3bb7e2d3688d73
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index acb9b29..684c01e 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -559,6 +559,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") |