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

simplify VCXProjectWriter::outputFileConfig a bit

Browse Source 
We don't need the filtername parameter.

Change-Id: I653db4a200c83d095520b47e1451dfe59b956d92
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Joerg Bornemann 2014-09-24 15:11:25 +02:00
parent 8b65e72b2d
commit 8ee2e497ae
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -1850,7 +1850,7 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
for (int i = 0; i < project.SingleProjects.count(); ++i) { for (int i = 0; i < project.SingleProjects.count(); ++i) {
VCFilter filter = project.SingleProjects.at(i).filterByName(filtername); VCFilter filter = project.SingleProjects.at(i).filterByName(filtername);
if (filter.Config) // only if the filter is not empty if (filter.Config) // only if the filter is not empty
if (outputFileConfig(filter, xml, xmlFilter, info.file, filtername, fileAdded)) // only add it once. if (outputFileConfig(filter, xml, xmlFilter, info.file, fileAdded)) // only add it once.
fileAdded = true; fileAdded = true;
} }
@ -1861,7 +1861,7 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
xmlFilter << closetag(); xmlFilter << closetag();
} }
bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, const QString &filtername, bool fileAllreadyAdded) bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAllreadyAdded)
{ {
bool fileAdded = false; bool fileAdded = false;
@ -1902,7 +1902,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
// Actual XML output ---------------------------------- // Actual XML output ----------------------------------
if (filter.useCustomBuildTool || filter.useCompilerTool if (filter.useCustomBuildTool || filter.useCompilerTool
|| !inBuild || filtername.startsWith("Deployment Files")) { || !inBuild || filter.Name.startsWith("Deployment Files")) {
if (filter.useCustomBuildTool) if (filter.useCustomBuildTool)
{ {
@ -1912,13 +1912,15 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
xmlFilter << tag("CustomBuild") xmlFilter << tag("CustomBuild")
<< attrTag("Include",Option::fixPathToLocalOS(filename)) << attrTag("Include",Option::fixPathToLocalOS(filename))
<< attrTagS("Filter", filtername); << attrTagS("Filter", filter.Name);
xml << tag("CustomBuild") xml << tag("CustomBuild")
<< attrTag("Include",Option::fixPathToLocalOS(filename)); << attrTag("Include",Option::fixPathToLocalOS(filename));
if (filtername.startsWith("Form Files") || filtername.startsWith("Generated Files") if (filter.Name.startsWith("Form Files")
|| filtername.startsWith("Resource Files") || filtername.startsWith("Deployment Files")) || filter.Name.startsWith("Generated Files")
|| filter.Name.startsWith("Resource Files")
|| filter.Name.startsWith("Deployment Files"))
xml << attrTagS("FileType", "Document"); xml << attrTagS("FileType", "Document");
} }
@ -1928,7 +1930,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
if ( !fileAdded && !fileAllreadyAdded ) if ( !fileAdded && !fileAllreadyAdded )
{ {
fileAdded = true; fileAdded = true;
outputFileConfig(xml, xmlFilter, filename, filtername); outputFileConfig(xml, xmlFilter, filename, filter.Name);
} }
const QString condition = generateCondition(*filter.Config); const QString condition = generateCondition(*filter.Config);
@ -1938,7 +1940,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
<< valueTag("true"); << valueTag("true");
} }
if (filtername.startsWith("Deployment Files") && inBuild) { if (filter.Name.startsWith("Deployment Files") && inBuild) {
xml << tag("DeploymentContent") xml << tag("DeploymentContent")
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag("true"); << valueTag("true");

2
qmake/generators/win32/msbuild_objectmodel.h
View File

@ -174,7 +174,7 @@ private:
static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName); static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName);
static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername); static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername);
static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername); static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername);
static bool outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, const QString &filtername, bool fileAllreadyAdded); static bool outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAllreadyAdded);
static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName); static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName);
static QString generateCondition(const VCConfiguration &config); static QString generateCondition(const VCConfiguration &config);