feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Make missing target path non-fatal.

Browse Source 
There might be e.g. subprojects in a SUBDIRS project that are not
supposed to be deployed. Let's support this without forcing people to
use CONFIG variables, but emit a big fat warning.

Change-Id: I17c9337cecbf68c632ce925fa9a53655dcfaba64
Reviewed-on: http://codereview.qt-project.org/5801
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-09-29 15:00:15 +02:00
parent b9002dc763
commit 7fa56b08cf
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -95,7 +95,9 @@ bool AbstractRemoteLinuxDeployStep::isDeploymentPossible(QString *whyNot) const
void AbstractRemoteLinuxDeployStep::run(QFutureInterface<bool> &fi)
{
connect(deployService(), SIGNAL(errorMessage(QString)), SLOT(handleErrorMessage(QString)));
connect(deployService(), SIGNAL(progressMessage(QString)), SLOT(handleProgressMessage(QString)));
connect(deployService(), SIGNAL(progressMessage(QString)),
SLOT(handleProgressMessage(QString)));
connect(deployService(), SIGNAL(warningMessage(QString)), SLOT(handleWarningMessage(QString)));
connect(deployService(), SIGNAL(stdOutData(QString)), SLOT(handleStdOutData(QString)));
connect(deployService(), SIGNAL(stdErrData(QString)), SLOT(handleStdErrData(QString)));
connect(deployService(), SIGNAL(finished()), SLOT(handleFinished()));
@@ -132,11 +134,19 @@ void AbstractRemoteLinuxDeployStep::handleProgressMessage(const QString &message
void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
{
emit addOutput(message, ErrorMessageOutput);
emit addTask(Task(Task::Error, message, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
d->hasError = true;
}
void AbstractRemoteLinuxDeployStep::handleWarningMessage(const QString &message)
{
emit addOutput(message, ErrorMessageOutput);
emit addTask(Task(Task::Warning, message, QString(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
void AbstractRemoteLinuxDeployStep::handleFinished()
{
if (d->hasError)