From d3eec168623f91a1df3a3f0de306a61294838777 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 22 Nov 2016 14:54:02 +0100 Subject: 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 --- qmake/generators/win32/msvc_nmake.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'qmake/generators/win32/msvc_nmake.cpp') 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 -- cgit v1.2.3