summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msbuild_objectmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp')
-rw-r--r--qmake/generators/win32/msbuild_objectmodel.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 58e600c48e..6cf6b96ab2 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -1855,7 +1855,7 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
}
if ( !fileAdded )
- outputFileConfig(xml, xmlFilter, info.file, filtername, false);
+ outputFileConfig(xml, xmlFilter, info.file, filtername);
xml << closetag();
xmlFilter << closetag();
@@ -1928,7 +1928,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
if ( !fileAdded && !fileAllreadyAdded )
{
fileAdded = true;
- outputFileConfig(xml, xmlFilter, filename, filtername, true);
+ outputFileConfig(xml, xmlFilter, filename, filtername);
}
const QString condition = generateCondition(*filter.Config);
@@ -1968,8 +1968,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
}
void VCXProjectWriter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter,
- const QString &filePath, const QString &filterName,
- bool checkDeploymentFilter)
+ const QString &filePath, const QString &filterName)
{
const QString nativeFilePath = Option::fixPathToLocalOS(filePath);
if (filterName.startsWith("Source Files")) {
@@ -2017,7 +2016,7 @@ void VCXProjectWriter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter,
xml << tag("ResourceCompile")
<< attrTag("Include", nativeFilePath);
}
- } else if (!checkDeploymentFilter || filterName.startsWith("Deployment Files")) {
+ } else {
xmlFilter << tag("None")
<< attrTag("Include", nativeFilePath)
<< attrTagS("Filter", filterName);