diff options
Diffstat (limited to 'src/plugins/qnx/blackberryabstractdeploystep.cpp')
| -rw-r--r-- | src/plugins/qnx/blackberryabstractdeploystep.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qnx/blackberryabstractdeploystep.cpp b/src/plugins/qnx/blackberryabstractdeploystep.cpp index 8b4b0252b3..f97c56df8e 100644 --- a/src/plugins/qnx/blackberryabstractdeploystep.cpp +++ b/src/plugins/qnx/blackberryabstractdeploystep.cpp @@ -81,7 +81,7 @@ bool BlackBerryAbstractDeployStep::init() m_processCounter = -1; m_environment = target()->activeBuildConfiguration()->environment(); - m_buildDirectory = target()->activeBuildConfiguration()->buildDirectory(); + m_buildDirectory = target()->activeBuildConfiguration()->buildDirectory().toString(); return true; } @@ -132,7 +132,8 @@ void BlackBerryAbstractDeployStep::reportProgress(int progress) { QTC_ASSERT(progress >= 0 && progress <= 100, return); - m_futureInterface->setProgressValue(100 * m_processCounter + progress); + if (m_futureInterface) + m_futureInterface->setProgressValue(100 * m_processCounter + progress); } void BlackBerryAbstractDeployStep::runCommands() @@ -186,7 +187,7 @@ void BlackBerryAbstractDeployStep::raiseError(const QString &errorMessage) { emit addOutput(errorMessage, BuildStep::ErrorMessageOutput); emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error, errorMessage, Utils::FileName(), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); + ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); } void BlackBerryAbstractDeployStep::processReadyReadStdOutput() |