diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-02 17:16:33 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-03 18:31:38 +0200 |
commit | f412f2b5ee58e3919a8cd514c8fcfa75444ae976 (patch) | |
tree | 3df5483f8807c9faa1cceab634c121c65a379566 /qmake/generators/win32/msbuild_objectmodel.cpp | |
parent | 6ad458bc93162753e448eea28499e778e2946d2c (diff) |
move platform toolset retrieval to VcprojGenerator
In a subsequent commit we will need access to more information of the
project object. This is merely a refactoring.
Change-Id: I40e501d037eb7d0295e1057e7b86e404e88e6ca3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp')
-rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 51cb73f0ce..feef587ee6 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -1779,8 +1779,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCConfiguration &tool) xml << tag("PropertyGroup") << attrTag("Condition", generateCondition(tool)) << attrTag("Label", "Configuration") - << attrTagS(_PlatformToolSet, platformToolSetVersion(tool.CompilerVersion, - tool.WinPhone)) + << attrTagS(_PlatformToolSet, tool.PlatformToolSet) << attrTagS(_OutputDirectory, tool.OutputDirectory) << attrTagT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage) << attrTagT(_BuildBrowserInformation, tool.BuildBrowserInformation) @@ -2193,27 +2192,4 @@ QString VCXProjectWriter::generateCondition(const VCConfiguration &config) return QStringLiteral("'$(Configuration)|$(Platform)'=='") + config.Name + QLatin1Char('\''); } -QString VCXProjectWriter::platformToolSetVersion(const DotNET version, bool winphoneBuild) -{ - // The PlatformToolset string corresponds to the name of a directory in - // $(VCTargetsPath)\Platforms\{Win32,x64,...}\PlatformToolsets - // e.g. v90, v100, v110, v110_xp, v120_CTP_Nov, v120, or WindowsSDK7.1 - - // This environment variable may be set by a commandline build - // environment such as the Windows SDK command prompt - QByteArray envVar = qgetenv("PlatformToolset"); - if (!envVar.isEmpty()) - return envVar; - - switch (version) - { - case NET2012: - return winphoneBuild ? "v110_wp80" : "v110"; - case NET2013: - return "v120"; - default: - return QString(); - } -} - QT_END_NAMESPACE |