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

remove special handling for the "Deployment Files" filter

Browse Source 
Files in "Deployment Files" should be added as static content, which
happens to be the fallback in the case where checkDeploymentFiles is
false. Also, the calling code expects that an XML tag is added in all
cases. This did not happen for the "Resource Files" filter when
checkDeploymentFiles was false, which led to unmatched closing tags.

This fixes the issue that files added to RESOURCES in different build
variants produced invalid vcxproj files.

Task-number: QTBUG-30373
Change-Id: Ibb27e67641ba63150938cf826ea1881d182fb841
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Joerg Bornemann 2014-09-23 14:42:54 +02:00
parent 990a413a2e
commit d41d4a0a35
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1855,7 +1855,7 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
} }
if ( !fileAdded ) if ( !fileAdded )
outputFileConfig(xml, xmlFilter, info.file, filtername, false); outputFileConfig(xml, xmlFilter, info.file, filtername);
xml << closetag(); xml << closetag();
xmlFilter << closetag(); xmlFilter << closetag();
@ -1928,7 +1928,7 @@ bool VCXProjectWriter::outputFileConfig(VCFilter &filter, XmlOutput &xml, XmlOut
if ( !fileAdded && !fileAllreadyAdded ) if ( !fileAdded && !fileAllreadyAdded )
{ {
fileAdded = true; fileAdded = true;
outputFileConfig(xml, xmlFilter, filename, filtername, true); outputFileConfig(xml, xmlFilter, filename, filtername);
} }
const QString condition = generateCondition(*filter.Config); 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, void VCXProjectWriter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter,
const QString &filePath, const QString &filterName, const QString &filePath, const QString &filterName)
bool checkDeploymentFilter)
{ {
const QString nativeFilePath = Option::fixPathToLocalOS(filePath); const QString nativeFilePath = Option::fixPathToLocalOS(filePath);
if (filterName.startsWith("Source Files")) { if (filterName.startsWith("Source Files")) {
@ -2017,7 +2016,7 @@ void VCXProjectWriter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter,
xml << tag("ResourceCompile") xml << tag("ResourceCompile")
<< attrTag("Include", nativeFilePath); << attrTag("Include", nativeFilePath);
} }
} else if (!checkDeploymentFilter || filterName.startsWith("Deployment Files")) { } else {
xmlFilter << tag("None") xmlFilter << tag("None")
<< attrTag("Include", nativeFilePath) << attrTag("Include", nativeFilePath)
<< attrTagS("Filter", filterName); << attrTagS("Filter", filterName);

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

@ -175,7 +175,7 @@ private:
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, const QString &filtername, bool fileAllreadyAdded);
static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName, bool checkDeploymentFilter); 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);
friend class XTreeNode; friend class XTreeNode;