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>

5 files changed, 10 insertions, 50 deletions

diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 914505a362..3f789405b2 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -615,7 +615,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
         << attrTag("Label", "ProjectConfigurations");
 
     bool isWinRT = false;
-    bool isWinPhone = false;
     for (int i = 0; i < tool.SingleProjects.count(); ++i) {
         xml << tag("ProjectConfiguration")
             << attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name)
@@ -623,7 +622,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
             << tagValue("Platform", tool.SingleProjects.at(i).PlatformName)
             << closetag();
         isWinRT = isWinRT || tool.SingleProjects.at(i).Configuration.WinRT;
-        isWinPhone = isWinPhone || tool.SingleProjects.at(i).Configuration.WinPhone;
     }
 
     xml << closetag()
@@ -637,7 +635,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
         xml << tagValue("MinimumVisualStudioVersion", tool.Version)
             << tagValue("DefaultLanguage", "en")
             << tagValue("AppContainerApplication", "true")
-            << tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store")
+            << tagValue("ApplicationType", "Windows Store")
             << tagValue("ApplicationTypeRevision", tool.SdkVersion);
         if (tool.SdkVersion == "10.0") {
             const QString ucrtVersion = qgetenv("UCRTVERSION");
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index da10b1984f..380ce60c5b 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -105,7 +105,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
                     return false;
                 }
 
-                const bool isPhone = project->isActiveConfig(QStringLiteral("winphone"));
 #ifdef Q_OS_WIN
                 QString regKey = QStringLiteral("Software\\Microsoft\\VisualStudio\\") + msvcVer + ("\\Setup\\VC\\ProductDir");
                 const QString vcInstallDir = qt_readRegistryKey(HKEY_LOCAL_MACHINE, regKey, KEY_WOW64_32KEY);
@@ -114,12 +113,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
                     return false;
                 }
 
-                QString windowsPath;
-                if (isPhone) {
-                    windowsPath = "Software\\Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v";
-                } else {
-                    windowsPath = "Software\\Microsoft\\Microsoft SDKs\\Windows\\v";
-                }
+                const QString windowsPath = "Software\\Microsoft\\Microsoft SDKs\\Windows\\v";
 
                 regKey = windowsPath + winsdkVer + QStringLiteral("\\InstallationFolder");
                 const QString kitDir = qt_readRegistryKey(HKEY_LOCAL_MACHINE, regKey, KEY_WOW64_32KEY);
@@ -166,23 +160,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
 
                     libDirs << crtLib + QStringLiteral("/ucrt/") + arch;
                     libDirs << crtLib + QStringLiteral("/um/") + arch;
-                } else if (isPhone) {
-                    QString sdkDir = vcInstallDir;
-                    if (!QDir(sdkDir).exists()) {
-                        fprintf(stderr, "Failed to find the Windows Phone SDK in %s.\n"
-                                        "Check that it is properly installed.\n",
-                                qPrintable(QDir::toNativeSeparators(sdkDir)));
-                        return false;
-                    }
-                    incDirs << sdkDir + QStringLiteral("/include");
-                    libDirs << sdkDir + QStringLiteral("/lib/store/") + compilerArch
-                            << sdkDir + QStringLiteral("/lib/") + compilerArch;
-                    binDirs << sdkDir + QStringLiteral("/bin/") + compiler;
-                    libDirs << kitDir + QStringLiteral("/lib/") + arch;
-                    incDirs << kitDir + QStringLiteral("/include")
-                            << kitDir + QStringLiteral("/include/abi")
-                            << kitDir + QStringLiteral("/include/mincore")
-                            << kitDir + QStringLiteral("/include/minwin");
                 } else {
                     incDirs << vcInstallDir + QStringLiteral("/include");
                     libDirs << vcInstallDir + QStringLiteral("/lib/store/") + compilerArch
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index f4e2ef33ac..33d96c146c 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2165,7 +2165,6 @@ VCPreLinkEventTool::VCPreLinkEventTool()
 
 VCConfiguration::VCConfiguration()
     :   WinRT(false),
-        WinPhone(false),
         ATLMinimizesCRunTimeLibraryUsage(unset),
         BuildBrowserInformation(unset),
         CharacterSet(charSetNotSet),
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 025112701b..10d44970ff 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -870,7 +870,7 @@ public:
 
     bool                    suppressUnknownOptionWarnings;
     DotNET                  CompilerVersion;
-    bool                    WinRT, WinPhone;
+    bool                    WinRT;
 
     // Variables
     triState                ATLMinimizesCRunTimeLibraryUsage;
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);