diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-07 16:53:32 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-10-09 06:55:52 +0200 |
| commit | 6e6c6f986840d5151d06689dcae35d6caf49a78c (patch) | |
| tree | d284de2222593db90f10f4827e76da377da8fa16 /qmake/generators | |
| parent | e5a8134765cdc69ba916416166f4d416137e2ffc (diff) | |
fix VS 2008 project file generation
Commit 4f21eb03 utterly broke the project file generation for
VS 2008. The introduced filterByName convenience methods looks for
filter names like "Generated Files", but the code path for
VS <= 2008 used filter names like "GeneratedFiles".
The generated projects were valid but empty.
This commit ensures that both VS generators use the same filter
names.
Task-number: QTBUG-41821
Change-Id: I828fa911bae8d835b073a4c2260316127cc72cda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index f174b654d7..f8e67718f7 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2521,14 +2521,14 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) // XML output functionality VCProject tempProj; tempProj.SingleProjects += tool; - outputFilter(tempProj, xml, "Sources"); - outputFilter(tempProj, xml, "Headers"); - outputFilter(tempProj, xml, "GeneratedFiles"); - outputFilter(tempProj, xml, "LexYaccFiles"); - outputFilter(tempProj, xml, "TranslationFiles"); - outputFilter(tempProj, xml, "FormFiles"); - outputFilter(tempProj, xml, "ResourceFiles"); - outputFilter(tempProj, xml, "DeploymentFiles"); + outputFilter(tempProj, xml, "Source Files"); + outputFilter(tempProj, xml, "Header Files"); + outputFilter(tempProj, xml, "Generated Files"); + outputFilter(tempProj, xml, "LexYacc Files"); + outputFilter(tempProj, xml, "Translation Files"); + outputFilter(tempProj, xml, "Form Files"); + outputFilter(tempProj, xml, "Resource Files"); + outputFilter(tempProj, xml, "Deployment Files"); QSet<QString> extraCompilersInProject; for (int i = 0; i < tool.ExtraCompilersFiles.count(); ++i) { @@ -2542,7 +2542,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool) for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) { outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x)); } - outputFilter(tempProj, xml, "RootFiles"); + outputFilter(tempProj, xml, "Root Files"); xml << closetag(q_Files) << tag(_Globals) << data(); // No "/>" end tag @@ -2574,18 +2574,18 @@ void VCProjectWriter::write(XmlOutput &xml, VCProject &tool) write(xml, tool.SingleProjects.at(i).Configuration); xml << closetag(_Configurations) << tag(q_Files); - outputFilter(tool, xml, "Sources"); - outputFilter(tool, xml, "Headers"); - outputFilter(tool, xml, "GeneratedFiles"); - outputFilter(tool, xml, "LexYaccFiles"); - outputFilter(tool, xml, "TranslationFiles"); - outputFilter(tool, xml, "FormFiles"); - outputFilter(tool, xml, "ResourceFiles"); - outputFilter(tool, xml, "DeploymentFiles"); + outputFilter(tool, xml, "Source Files"); + outputFilter(tool, xml, "Header Files"); + outputFilter(tool, xml, "Generated Files"); + outputFilter(tool, xml, "LexYacc Files"); + outputFilter(tool, xml, "Translation Files"); + outputFilter(tool, xml, "Form Files"); + outputFilter(tool, xml, "Resource Files"); + outputFilter(tool, xml, "Deployment Files"); for (int x = 0; x < tool.ExtraCompilers.count(); ++x) { outputFilter(tool, xml, tool.ExtraCompilers.at(x)); } - outputFilter(tool, xml, "RootFiles"); + outputFilter(tool, xml, "Root Files"); xml << closetag(q_Files) << tag(_Globals) << data(); // No "/>" end tag |