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

Use correct toolset version for winphone builds

Browse Source 
Change-Id: I9ecd9f632d0201e060de5cce4782912efdc6bd32
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oliver Wolff 2013-02-12 15:58:40 +01:00 committed by The Qt Project
parent 7c8ef213b5
commit 1d4e1e12d8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1672,7 +1672,8 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCConfiguration &tool)
xml << tag("PropertyGroup") xml << tag("PropertyGroup")
<< attrTag("Condition", generateCondition(tool)) << attrTag("Condition", generateCondition(tool))
<< attrTag("Label", "Configuration") << attrTag("Label", "Configuration")
<< attrTagS(_PlatformToolSet, platformToolSetVersion(tool.CompilerVersion)) << attrTagS(_PlatformToolSet, platformToolSetVersion(tool.CompilerVersion,
tool.WinPhone))
<< attrTagS(_OutputDirectory, tool.OutputDirectory) << attrTagS(_OutputDirectory, tool.OutputDirectory)
<< attrTagT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage) << attrTagT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage)
<< attrTagT(_BuildBrowserInformation, tool.BuildBrowserInformation) << attrTagT(_BuildBrowserInformation, tool.BuildBrowserInformation)
@ -2075,12 +2076,12 @@ QString VCXProjectWriter::generateCondition(const VCConfiguration &config)
return QStringLiteral("'$(Configuration)|$(Platform)'=='") + config.Name + QLatin1Char('\''); return QStringLiteral("'$(Configuration)|$(Platform)'=='") + config.Name + QLatin1Char('\'');
} }
QString VCXProjectWriter::platformToolSetVersion(const DotNET version) QString VCXProjectWriter::platformToolSetVersion(const DotNET version, bool winphoneBuild)
{ {
switch (version) switch (version)
{ {
case NET2012: case NET2012:
return "v110"; return winphoneBuild ? "v110_wp80" : "v110";
case NET2013: case NET2013:
return "v120"; return "v120";
} }

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

@ -183,7 +183,7 @@ private:
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 QString generateCondition(const VCConfiguration &config); static QString generateCondition(const VCConfiguration &config);
static QString platformToolSetVersion(const DotNET version); static QString platformToolSetVersion(const DotNET version, bool winphoneBuild);
friend class XTreeNode; friend class XTreeNode;
friend class XFlatNode; friend class XFlatNode;