Commit 2bfa7612 authored by Oliver Wolff's avatar Oliver Wolff
Browse files

WinRT: be more verbose about deployment issues



Change-Id: I5a507b2f541e779cd6bcb7ec4f8378013bef82f2
Reviewed-by: default avatarAndrew Knight <andrew.knight@theqtcompany.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
parent d260f365
...@@ -78,8 +78,7 @@ bool WinRtPackageDeploymentStep::init() ...@@ -78,8 +78,7 @@ bool WinRtPackageDeploymentStep::init()
m_targetFilePath = appTargetFilePath.toString(); m_targetFilePath = appTargetFilePath.toString();
if (m_targetFilePath.isEmpty()) { if (m_targetFilePath.isEmpty()) {
// ### raise error in 3.3 raiseError(tr("No executable to deploy found in %1.").arg(rc->proFilePath()));
// raiseError(tr("No executable to deploy found in %1.").arg(rc->proFilePath()));
return false; return false;
} }
...@@ -188,8 +187,7 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt ...@@ -188,8 +187,7 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt
relativeRemotePath = QDir(baseDir).relativeFilePath(pair.second); relativeRemotePath = QDir(baseDir).relativeFilePath(pair.second);
if (QDir(relativeRemotePath).isAbsolute() || relativeRemotePath.startsWith(QLatin1String(".."))) { if (QDir(relativeRemotePath).isAbsolute() || relativeRemotePath.startsWith(QLatin1String(".."))) {
// for 3.3? raiseWarning(tr("File %1 is outside of the executable's directory. These files cannot be installed.").arg(relativeRemotePath));
// raiseWarning(tr("File %1 is outside of the executable's directory. These files cannot be installed.").arg(relativeRemotePath));
continue; continue;
} }
...@@ -248,6 +246,13 @@ void WinRtPackageDeploymentStep::raiseError(const QString &errorMessage) ...@@ -248,6 +246,13 @@ void WinRtPackageDeploymentStep::raiseError(const QString &errorMessage)
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT));
} }
void WinRtPackageDeploymentStep::raiseWarning(const QString &warningMessage)
{
emit addOutput(warningMessage, BuildStep::MessageOutput);
emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Warning, warningMessage, Utils::FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT));
}
bool WinRtPackageDeploymentStep::fromMap(const QVariantMap &map) bool WinRtPackageDeploymentStep::fromMap(const QVariantMap &map)
{ {
if (!AbstractProcessStep::fromMap(map)) if (!AbstractProcessStep::fromMap(map))
......
Supports Markdown
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