Commit 9287229d authored by Oliver Wolff's avatar Oliver Wolff
Browse files

WinRT: Remove support for Windows Phone 8.0



Change-Id: I0e738ff7c8e9ef53d4a9a4c1a2105b1a4e974255
Reviewed-by: default avatarAndrew Knight <andrew.knight@theqtcompany.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
parent 3c846939
......@@ -101,19 +101,12 @@ bool WinRtPackageDeploymentStep::init()
m_manifestFileName = QStringLiteral("AppxManifest");
if (qt->type() == QLatin1String(Constants::WINRT_WINPHONEQT)) {
if (qt->type() == QLatin1String(Constants::WINRT_WINPHONEQT))
m_createMappingFile = true;
if (qt->mkspec().toString().contains(QLatin1String("msvc2012")))
m_manifestFileName = QStringLiteral("WMAppManifest");
}
if (m_createMappingFile) {
args += QLatin1String(" -list mapping");
m_mappingFileContent = QLatin1String("[Files]\n");
if (qt->mkspec().toString().contains(QLatin1String("msvc2012"))) {
m_mappingFileContent += QLatin1Char('"') + QDir::toNativeSeparators(m_targetDirPath) + m_manifestFileName
+ QLatin1String(".xml\" \"") + m_manifestFileName + QLatin1String(".xml\"\n");
}
QDir assetDirectory(m_targetDirPath + QLatin1String("assets"));
if (assetDirectory.exists()) {
......@@ -160,8 +153,8 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt
installableFilesList.append(QPair<QString, QString>(localFilePath, remoteFilePath));
}
// if there are no INSTALLS set we just deploy the files from windeployqt, the manifest (in case of 2012)
// and the icons referenced in there and the actual build target
// if there are no INSTALLS set we just deploy the files from windeployqt,
// the icons referenced in the manifest file and the actual build target
QString baseDir;
if (targetInstallationPath.isEmpty()) {
if (!m_targetFilePath.endsWith(QLatin1String(".exe")))
......@@ -185,24 +178,9 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt
relativeRemotePath = QDir(baseDir).relativeFilePath(pair.second);
if (QDir(relativeRemotePath).isAbsolute() || relativeRemotePath.startsWith(QLatin1String(".."))) {
// special case for winphone 8.0 font deployment
const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (!qt)
return false;
if (qt->mkspec().toString().contains(QLatin1String("msvc2012"))) {
const QString fileName = relativeRemotePath.mid(relativeRemotePath.lastIndexOf(QLatin1Char('/')) + 1);
if (QFile::exists(m_targetDirPath + QLatin1String("fonts/") + fileName)) {
relativeRemotePath = QLatin1String("fonts/") + fileName;
} else {
// for 3.3?
// raiseWarning(tr("File %1 is outside of the executable's directory. These files cannot be installed.").arg(relativeRemotePath));
continue;
}
} else {
// for 3.3?
// raiseWarning(tr("File %1 is outside of the executable's directory. These files cannot be installed.").arg(relativeRemotePath));
continue;
}
// for 3.3?
// raiseWarning(tr("File %1 is outside of the executable's directory. These files cannot be installed.").arg(relativeRemotePath));
continue;
}
m_mappingFileContent += QLatin1Char('"') + QDir::toNativeSeparators(pair.first)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment