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

remove unsupported winrt mkspecs

Browse Source 
These mkspecs are not supported and no longer compile. Related support in
qmake has also been removed.

Change-Id: I7706dcfa5471e55e2ae3d580d65e9371e2c652d5
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
Andrew Knight 2014-12-12 15:45:46 +02:00
parent e746f14d4d
commit affba56094
22 changed files with 11 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mkspecs/common/winrt_winphone/assets/logo_medium.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
mkspecs/common/winrt_winphone/assets/tile_iconic_small.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

37
mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
View File

@ -1,37 +0,0 @@
<?xml version=\"1.0\" encoding=\"utf-8\"?>
<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\">
<Identity
Name=\"$${WINRT_MANIFEST.identity}\"
ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\"
Publisher=\"$${WINRT_MANIFEST.publisherid}\"
Version=\"$${WINRT_MANIFEST.version}\" />
<Properties>
<DisplayName>$${WINRT_MANIFEST.name}</DisplayName>
<PublisherDisplayName>$${WINRT_MANIFEST.publisher}</PublisherDisplayName>
<Logo>$${WINRT_MANIFEST.logo_store}</Logo>
</Properties>
<Prerequisites>
<OSMinVersion>6.2.0</OSMinVersion>
<OSMaxVersionTested>6.3.0</OSMaxVersionTested>
</Prerequisites>
<Resources>
<Resource Language=\"en\" />
</Resources>
<Applications>
<Application
Id=\"App\"
Executable=\"$${WINRT_MANIFEST.target}.exe\"
EntryPoint=\"$${WINRT_MANIFEST.target}.App\">
<VisualElements
DisplayName=\"$${WINRT_MANIFEST.name}\"
Logo=\"$${WINRT_MANIFEST.logo_large}\"
SmallLogo=\"$${WINRT_MANIFEST.logo_small}\"
Description=\"$${WINRT_MANIFEST.description}\"
BackgroundColor=\"$${WINRT_MANIFEST.background}\"
ForegroundText=\"$${WINRT_MANIFEST.foreground}\">
<SplashScreen Image=\"$${WINRT_MANIFEST.logo_splash}\" />
</VisualElements>
</Application>
</Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
</Package>
<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->

38
mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in
View File

@ -1,38 +0,0 @@
<?xml version=\"1.0\" encoding=\"utf-8\"?>
<Deployment xmlns=\"http://schemas.microsoft.com/windowsphone/2012/deployment\" AppPlatformVersion=\"8.0\">
<DefaultLanguage xmlns=\"\" code=\"$${WINRT_MANIFEST.default_language}\" />$${WINRT_MANIFEST.languages}
<App xmlns=\"\"
ProductID=\"$${WINRT_MANIFEST.identity}\"
Title=\"$${WINRT_MANIFEST.name}\"
RuntimeType=\"Modern Native\"
Version=\"$${WINRT_MANIFEST.version}\"
Genre=\"$${WINRT_MANIFEST.genre}\"
Author=\"$${WINRT_MANIFEST.author}\"
Description=\"$${WINRT_MANIFEST.description}\"
Publisher=\"$${WINRT_MANIFEST.publisher}\"
PublisherID=\"$${WINRT_MANIFEST.publisherid}\">
<IconPath IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.logo_medium}</IconPath>$${WINRT_MANIFEST.capabilities}
<Tasks>
<DefaultTask
Name=\"_default\"
ImagePath=\"$${WINRT_MANIFEST.target}.exe\"
ImageParams=\"$${WINRT_MANIFEST.arguments}\" />
</Tasks>
<Tokens>
<PrimaryToken TokenID=\"$${WINRT_MANIFEST.target}\" TaskName=\"_default\">
<TemplateIconic>
<SmallImageURI IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.tile_iconic_small}</SmallImageURI>
<IconImageURI IsRelative=\"true\" IsResource=\"false\">$${WINRT_MANIFEST.tile_iconic_medium}</IconImageURI>
<Title>$${WINRT_MANIFEST.name}</Title>
<BackgroundColor>$${WINRT_MANIFEST.background}</BackgroundColor>
</TemplateIconic>
</PrimaryToken>
</Tokens>
<ScreenResolutions>
<ScreenResolution Name=\"ID_RESOLUTION_WVGA\" />
<ScreenResolution Name=\"ID_RESOLUTION_WXGA\" />
<ScreenResolution Name=\"ID_RESOLUTION_HD720P\" />
</ScreenResolutions>
</App>
</Deployment>
<!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->

2
mkspecs/common/winrt_winphone/qmake.conf
View File

@ -1,5 +1,5 @@
# #
# qmake configuration for winrt and windows phone 8 # qmake configuration for winrt and windows phone 8.1
# #
# Written for Microsoft Visual C++ # Written for Microsoft Visual C++
# #

21
mkspecs/winphone-arm-msvc2012/qmake.conf
View File

@ -1,21 +0,0 @@
#
# qmake configuration for winphone-arm-msvc2012
#
# Written for Microsoft Visual C++ 2012
#
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM
CONFIG += font_deployment
DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__
QMAKE_LFLAGS += /MACHINE:ARM
QMAKE_LIBS += WindowsPhoneCore.lib PhoneAppModelHost.lib
VCPROJ_ARCH = ARM
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = WP80
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in

34
mkspecs/winphone-arm-msvc2012/qplatformdefs.h
View File

@ -1,34 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "../common/winrt_winphone/qplatformdefs.h"

21
mkspecs/winphone-x86-msvc2012/qmake.conf
View File

@ -1,21 +0,0 @@
#
# qmake configuration for winphone-x86-msvc2012
#
# Written for Microsoft Visual C++ 2012
#
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM
CONFIG += font_deployment
DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__
QMAKE_LFLAGS += /MACHINE:X86
QMAKE_LIBS += WindowsPhoneCore.lib PhoneAppModelHost.lib
VCPROJ_ARCH = Win32
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = WP80
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in

34
mkspecs/winphone-x86-msvc2012/qplatformdefs.h
View File

@ -1,34 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "../common/winrt_winphone/qplatformdefs.h"

20
mkspecs/winrt-arm-msvc2012/qmake.conf
View File

@ -1,20 +0,0 @@
#
# qmake configuration for winrt-arm-msvc2012
#
# Written for Microsoft Visual C++ 2012
#
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__
QMAKE_LFLAGS += /MACHINE:ARM
QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib
VCPROJ_ARCH = ARM
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = arm

34
mkspecs/winrt-arm-msvc2012/qplatformdefs.h
View File

@ -1,34 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "../common/winrt_winphone/qplatformdefs.h"

20
mkspecs/winrt-x64-msvc2012/qmake.conf
View File

@ -1,20 +0,0 @@
#
# qmake configuration for winrt-x64-msvc2012
#
# Written for Microsoft Visual C++ 2012
#
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X64 __X64__ __x64__
QMAKE_LFLAGS += /MACHINE:X64
QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib
VCPROJ_ARCH = x64
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x64

34
mkspecs/winrt-x64-msvc2012/qplatformdefs.h
View File

@ -1,34 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "../common/winrt_winphone/qplatformdefs.h"

20
mkspecs/winrt-x86-msvc2012/qmake.conf
View File

@ -1,20 +0,0 @@
#
# qmake configuration for winrt-x86-msvc2012
#
# Written for Microsoft Visual C++ 2012
#
include(../common/winrt_winphone/qmake.conf)
QMAKE_COMPILER_DEFINES += _MSC_VER=1700
DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__
QMAKE_LFLAGS += /SAFESEH /MACHINE:X86
QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib
VCPROJ_ARCH = Win32
MSVC_VER = 11.0
WINSDK_VER = 8.0
WINTARGET_VER = win8
WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in
WINRT_MANIFEST.architecture = x86

34
mkspecs/winrt-x86-msvc2012/qplatformdefs.h
View File

@ -1,34 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "../common/winrt_winphone/qplatformdefs.h"

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

@ -615,7 +615,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
bool isWinRT = false; bool isWinRT = false;
bool isWinPhone = false; bool isWinPhone = false;
bool isWinPhone80 = false; // ### Windows Phone 8.0, remove in Qt 5.4
for (int i = 0; i < tool.SingleProjects.count(); ++i) { for (int i = 0; i < tool.SingleProjects.count(); ++i) {
xml << tag("ProjectConfiguration") xml << tag("ProjectConfiguration")
<< attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name) << attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name)
@ -624,7 +623,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
<< closetag(); << closetag();
isWinRT = isWinRT || tool.SingleProjects.at(i).Configuration.WinRT; isWinRT = isWinRT || tool.SingleProjects.at(i).Configuration.WinRT;
isWinPhone = isWinPhone = tool.SingleProjects.at(i).Configuration.WinPhone; isWinPhone = isWinPhone = tool.SingleProjects.at(i).Configuration.WinPhone;
isWinPhone80 = isWinPhone80 || tool.SingleProjects.at(i).Configuration.WinPhone80;
} }
xml << closetag() xml << closetag()
@ -636,18 +634,10 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
if (isWinRT) { if (isWinRT) {
xml << tagValue("MinimumVisualStudioVersion", tool.Version) xml << tagValue("MinimumVisualStudioVersion", tool.Version)
<< tagValue("DefaultLanguage", "en"); << tagValue("DefaultLanguage", "en")
if (isWinPhone80) { << tagValue("AppContainerApplication", "true")
xml << tagValue("WinMDAssembly", "true"); << tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store")
if (tool.SingleProjects.at(0).Configuration.ConfigurationType == typeApplication) { << tagValue("ApplicationTypeRevision", tool.SdkVersion);
xml << tagValue("XapOutputs", "true");
xml << tagValue("XapFilename", "$(RootNamespace)_$(Configuration)_$(Platform).xap");
}
} else {
xml << tagValue("AppContainerApplication", "true")
<< tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store")
<< tagValue("ApplicationTypeRevision", tool.SdkVersion);
}
} }
xml << closetag(); xml << closetag();
@ -832,19 +822,9 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
} }
outputFilter(tool, xml, xmlFilter, "Root Files"); outputFilter(tool, xml, xmlFilter, "Root Files");
if (isWinPhone80) {
xml << tag("ItemGroup")
<< tag("Reference")
<< attrTag("Include", "platform")
<< attrTagS("IsWinMDFile", "true")
<< attrTagS("Private", "false")
<< closetag()
<< closetag();
}
// App manifest // App manifest
if (isWinRT) { if (isWinRT) {
QString manifest = isWinPhone80 ? QStringLiteral("WMAppManifest.xml") : QStringLiteral("Package.appxmanifest"); const QString manifest = QStringLiteral("Package.appxmanifest");
// Find all icons referenced in the manifest // Find all icons referenced in the manifest
QSet<QString> icons; QSet<QString> icons;
@ -865,7 +845,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
// Write out manifest + icons as content items // Write out manifest + icons as content items
xml << tag(_ItemGroup) xml << tag(_ItemGroup)
<< tag(isWinPhone80 ? "Xml" : "AppxManifest") << tag("AppxManifest")
<< attrTag("Include", manifest) << attrTag("Include", manifest)
<< closetag(); << closetag();
foreach (const QString &icon, icons) { foreach (const QString &icon, icons) {
@ -876,12 +856,8 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
xml << closetag(); xml << closetag();
} }
xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets"); xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets")
<< tag("ImportGroup")
if (isWinPhone80)
xml << import("Project", "$(MSBuildExtensionsPath)\\Microsoft\\WindowsPhone\\v8.0\\Microsoft.Cpp.WindowsPhone.8.0.targets");
xml << tag("ImportGroup")
<< attrTag("Label", "ExtensionTargets") << attrTag("Label", "ExtensionTargets")
<< closetag(); << closetag();
} }

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

@ -160,10 +160,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
QString windowsPath; QString windowsPath;
if (isPhone) { if (isPhone) {
if (targetVer == "WP80") // ### Windows Phone 8.0, remove in Qt 5.4 windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v";
windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhone\\v";
else
windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v";
} else { } else {
windowsPath = "Microsoft\\Microsoft SDKs\\Windows\\v"; windowsPath = "Microsoft\\Microsoft SDKs\\Windows\\v";
} }
@ -184,8 +181,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
QStringList binDirs; QStringList binDirs;
if (isPhone) { if (isPhone) {
QString sdkDir = vcInstallDir; QString sdkDir = vcInstallDir;
if (targetVer == "WP80")
sdkDir += QStringLiteral("/WPSDK/") + targetVer;
if (!QDir(sdkDir).exists()) { if (!QDir(sdkDir).exists()) {
fprintf(stderr, "Failed to find the Windows Phone SDK in %s.\n" fprintf(stderr, "Failed to find the Windows Phone SDK in %s.\n"
"Check that it is properly installed.\n", "Check that it is properly installed.\n",

1
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -2137,7 +2137,6 @@ VCPreLinkEventTool::VCPreLinkEventTool()
VCConfiguration::VCConfiguration() VCConfiguration::VCConfiguration()
: WinRT(false), : WinRT(false),
WinPhone(false), WinPhone(false),
WinPhone80(false),
ATLMinimizesCRunTimeLibraryUsage(unset), ATLMinimizesCRunTimeLibraryUsage(unset),
BuildBrowserInformation(unset), BuildBrowserInformation(unset),
CharacterSet(charSetNotSet), CharacterSet(charSetNotSet),

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

@ -873,7 +873,7 @@ public:
bool suppressUnknownOptionWarnings; bool suppressUnknownOptionWarnings;
DotNET CompilerVersion; DotNET CompilerVersion;
bool WinRT, WinPhone, WinPhone80; bool WinRT, WinPhone;
// Variables // Variables
triState ATLMinimizesCRunTimeLibraryUsage; triState ATLMinimizesCRunTimeLibraryUsage;

68
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -908,11 +908,6 @@ void VcprojGenerator::initProject()
initFormFiles(); initFormFiles();
initResourceFiles(); initResourceFiles();
initExtraCompilerOutputs(); initExtraCompilerOutputs();
if (vcProject.Configuration.WinRT) {
if (vcProject.Configuration.WinPhone80
&& vcProject.Configuration.ConfigurationType == typeApplication)
initWMAppManifest();
}
// Own elements ----------------------------- // Own elements -----------------------------
vcProject.Name = unescapeFilePath(project->first("QMAKE_ORIG_TARGET").toQString()); vcProject.Name = unescapeFilePath(project->first("QMAKE_ORIG_TARGET").toQString());
@ -1020,7 +1015,6 @@ void VcprojGenerator::initConfiguration()
conf.WinRT = project->isActiveConfig("winrt"); conf.WinRT = project->isActiveConfig("winrt");
if (conf.WinRT) { if (conf.WinRT) {
conf.WinPhone = project->isActiveConfig("winphone"); conf.WinPhone = project->isActiveConfig("winphone");
conf.WinPhone80 = project->first("WINTARGET_VER") == "WP80";
// Saner defaults // Saner defaults
conf.compiler.UsePrecompiledHeader = pchNone; conf.compiler.UsePrecompiledHeader = pchNone;
conf.compiler.CompileAsWinRT = _False; conf.compiler.CompileAsWinRT = _False;
@ -1616,68 +1610,6 @@ void VcprojGenerator::initExtraCompilerOutputs()
} }
} }
void VcprojGenerator::initWMAppManifest()
{
if (!project->isActiveConfig("autogen_wmappmanifest"))
return;
// autogen_wmappmanifest
QFile file(Option::output_dir + "\\WMAppManifest.xml");
if (!file.open(QFile::WriteOnly))
return;
QTextStream stream(&file);
QString productID = project->first("PRODUCTID").toQString();
QString target = project->first("TARGET").toQString();
QString author = project->first("AUTHOR").toQString();
QString publisher = project->first("PUBLISHER").toQString();
QString publisherID = project->first("PUBLISHERID").toQString();
QString description = project->first("DESCRIPTION").toQString();
if (author.isEmpty())
author = "Qt";
if (publisher.isEmpty())
publisher = "Qt";
if (productID.isEmpty())
productID = QUuid::createUuid().toString();
if (publisherID.isEmpty())
publisherID = QUuid::createUuid().toString();
stream << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
<< "<Deployment xmlns=\"http://schemas.microsoft.com/windowsphone/2012/deployment\" AppPlatformVersion=\"8.0\">\n"
<< " <DefaultLanguage xmlns=\"\" code=\"en-US\"/>\n"
<< " <App xmlns=\"\" ProductID=\"" << productID << "\" Title=\"" << target
<< "\" RuntimeType=\"Modern Native\" Version=\"1.0.0.0\""
<< " Genre=\"apps.normal\" Author=\"" << author
<< "\" Description=\"" << description << "\" Publisher=\"" << publisher
<< "\" PublisherID=\"" << publisherID << "\">\n"
<< " <IconPath IsRelative=\"true\" IsResource=\"false\">ApplicationIcon.png</IconPath>\n"
<< " <Capabilities>\n"
<< " <Capability Name=\"ID_CAP_NETWORKING\" />\n"
<< " <Capability Name=\"ID_CAP_MEDIALIB_AUDIO\" />\n"
<< " <Capability Name=\"ID_CAP_MEDIALIB_PLAYBACK\" />\n"
<< " </Capabilities>\n"
<< " <Tasks>\n"
<< " <DefaultTask Name=\"_default\" ImagePath=\"" << target << ".exe\" ImageParams=\"\" />\n"
<< " </Tasks>\n"
<< " <Tokens>\n"
<< " <PrimaryToken TokenID=\"" << target << "Token\" TaskName=\"_default\">\n"
<< " <TemplateType5>\n"
<< " <Count>0</Count>\n"
<< " <Title>" << target << "</Title>\n"
<< " </TemplateType5>\n"
<< " </PrimaryToken>\n"
<< " </Tokens>\n"
<< " <ScreenResolutions>\n"
<< " <ScreenResolution Name=\"ID_RESOLUTION_WVGA\" />\n"
<< " <ScreenResolution Name=\"ID_RESOLUTION_WXGA\" />\n"
<< " <ScreenResolution Name=\"ID_RESOLUTION_HD720P\" />\n"
<< " </ScreenResolutions>\n"
<< " </App>\n"
<< "</Deployment>\n";
}
void VcprojGenerator::initOld() void VcprojGenerator::initOld()
{ {
// $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- // $$QMAKE.. -> $$MSVCPROJ.. -------------------------------------

1
qmake/generators/win32/msvc_vcproj.h
View File

@ -113,7 +113,6 @@ protected:
void initDeploymentFiles(); void initDeploymentFiles();
void initLexYaccFiles(); void initLexYaccFiles();
void initExtraCompilerOutputs(); void initExtraCompilerOutputs();
void initWMAppManifest();
void writeSubDirs(QTextStream &t); // Called from VCXProj backend void writeSubDirs(QTextStream &t); // Called from VCXProj backend
QUuid getProjectUUID(const QString &filename=QString()); // Called from VCXProj backend QUuid getProjectUUID(const QString &filename=QString()); // Called from VCXProj backend