diff options
author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-11-22 14:54:02 +0100 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-01-18 12:38:56 +0000 |
commit | d3eec168623f91a1df3a3f0de306a61294838777 (patch) | |
tree | c00928b2371d75cada51805f89590e80459a3051 /qmake/generators/win32/msvc_vcproj.cpp | |
parent | b9887f3d9a8eff2b23b5f7c561054f215c5cc185 (diff) |
Remove support for WinRT 8.1 and Windows Phone 8.1
[ChangeLog][QtBase][General] Removed support for WinRT/Windows Phone 8.1.
Task-number: QTBUG-57288
Change-Id: Ifd6d6780cbbdb710d99556ba3d2fb2e514d4f789
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 6a8d8b7e0f..b3da4db4c5 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -291,20 +291,16 @@ QString VcprojGenerator::retrievePlatformToolSet() const if (!envVar.isEmpty()) return envVar; - QString suffix; - if (project->isActiveConfig("winphone")) - suffix = '_' + project->first("WINTARGET_VER").toQString().toLower(); - switch (vcProject.Configuration.CompilerVersion) { case NET2012: - return QStringLiteral("v110") + suffix; + return QStringLiteral("v110"); case NET2013: - return QStringLiteral("v120") + suffix; + return QStringLiteral("v120"); case NET2015: - return QStringLiteral("v140") + suffix; + return QStringLiteral("v140"); case NET2017: - return QStringLiteral("v141") + suffix; + return QStringLiteral("v141"); default: return QString(); } @@ -921,7 +917,6 @@ void VcprojGenerator::initConfiguration() if (conf.CompilerVersion >= NET2012) { conf.WinRT = project->isActiveConfig("winrt"); if (conf.WinRT) { - conf.WinPhone = project->isActiveConfig("winphone"); // Saner defaults conf.compiler.UsePrecompiledHeader = pchNone; conf.compiler.CompileAsWinRT = _False; @@ -1322,18 +1317,9 @@ void VcprojGenerator::initWinDeployQtTool() // structure (for instance for plugins). However, the MDILXapCompile call // itself contains the original subdirectories as parameters and hence the // call fails. - // Neither there is a way to disable this behavior for Windows Phone, nor - // to influence the parameters. Hence the only way to get a build - // done is to recreate the directory structure manually by invoking - // windeployqt a second time, so that the MDILXapCompile call succeeds and - // deployment continues. - if (conf.WinPhone) { - conf.windeployqt.CommandLine = commandLine - + QStringLiteral(" -list relative -dir \"$(MSBuildProjectDirectory)\\") - + var("OBJECTS_DIR") - + QStringLiteral("MSIL\" \"$(OutDir)\\$(TargetName).exe\" ") - + QLatin1String(" && "); - } + // Hence the only way to get a build done is to recreate the directory + // structure manually by invoking windeployqt a second time, so that + // the MDILXapCompile call succeeds and deployment continues. conf.windeployqt.CommandLine += commandLine + QStringLiteral(" -list relative -dir \"$(MSBuildProjectDirectory)\" \"$(OutDir)\\$(TargetName).exe\" > ") + MakefileGenerator::shellQuote(conf.windeployqt.Record); |