1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix VS 2008 project file generation

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2014-10-07 16:53:32 +02:00 committed by Jani Heikkinen
parent e5a8134765
commit 6e6c6f9868
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -2521,14 +2521,14 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
// XML output functionality // XML output functionality
VCProject tempProj; VCProject tempProj;
tempProj.SingleProjects += tool; tempProj.SingleProjects += tool;
outputFilter(tempProj, xml, "Sources"); outputFilter(tempProj, xml, "Source Files");
outputFilter(tempProj, xml, "Headers"); outputFilter(tempProj, xml, "Header Files");
outputFilter(tempProj, xml, "GeneratedFiles"); outputFilter(tempProj, xml, "Generated Files");
outputFilter(tempProj, xml, "LexYaccFiles"); outputFilter(tempProj, xml, "LexYacc Files");
outputFilter(tempProj, xml, "TranslationFiles"); outputFilter(tempProj, xml, "Translation Files");
outputFilter(tempProj, xml, "FormFiles"); outputFilter(tempProj, xml, "Form Files");
outputFilter(tempProj, xml, "ResourceFiles"); outputFilter(tempProj, xml, "Resource Files");
outputFilter(tempProj, xml, "DeploymentFiles"); outputFilter(tempProj, xml, "Deployment Files");
QSet<QString> extraCompilersInProject; QSet<QString> extraCompilersInProject;
for (int i = 0; i < tool.ExtraCompilersFiles.count(); ++i) { 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) { for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) {
outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x)); outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x));
} }
outputFilter(tempProj, xml, "RootFiles"); outputFilter(tempProj, xml, "Root Files");
xml << closetag(q_Files) xml << closetag(q_Files)
<< tag(_Globals) << tag(_Globals)
<< data(); // No "/>" end tag << data(); // No "/>" end tag
@ -2574,18 +2574,18 @@ void VCProjectWriter::write(XmlOutput &xml, VCProject &tool)
write(xml, tool.SingleProjects.at(i).Configuration); write(xml, tool.SingleProjects.at(i).Configuration);
xml << closetag(_Configurations) xml << closetag(_Configurations)
<< tag(q_Files); << tag(q_Files);
outputFilter(tool, xml, "Sources"); outputFilter(tool, xml, "Source Files");
outputFilter(tool, xml, "Headers"); outputFilter(tool, xml, "Header Files");
outputFilter(tool, xml, "GeneratedFiles"); outputFilter(tool, xml, "Generated Files");
outputFilter(tool, xml, "LexYaccFiles"); outputFilter(tool, xml, "LexYacc Files");
outputFilter(tool, xml, "TranslationFiles"); outputFilter(tool, xml, "Translation Files");
outputFilter(tool, xml, "FormFiles"); outputFilter(tool, xml, "Form Files");
outputFilter(tool, xml, "ResourceFiles"); outputFilter(tool, xml, "Resource Files");
outputFilter(tool, xml, "DeploymentFiles"); outputFilter(tool, xml, "Deployment Files");
for (int x = 0; x < tool.ExtraCompilers.count(); ++x) { for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
outputFilter(tool, xml, tool.ExtraCompilers.at(x)); outputFilter(tool, xml, tool.ExtraCompilers.at(x));
} }
outputFilter(tool, xml, "RootFiles"); outputFilter(tool, xml, "Root Files");
xml << closetag(q_Files) xml << closetag(q_Files)
<< tag(_Globals) << tag(_Globals)
<< data(); // No "/>" end tag << data(); // No "/>" end tag