summaryrefslogtreecommitdiff
path: root/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-07-25 17:41:01 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2012-07-26 12:50:06 +0200
commitb906360a341800b84b5c8e0e2442698de10beb9e (patch)
tree4baf03f4aeb817c2c622c033fc7dd33674ab1038 /src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
parent0fcd30cc6191925ea3cba2baad6533a946c9ccd2 (diff)
downloadqt-creator-b906360a341800b84b5c8e0e2442698de10beb9e.tar.gz
madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport, Derive qtVersionId from profile instead of qt build configuration. Replace qt4BuildConfiguration with buildConfiguration. Use IDevice base class in AbstractRemoteLinuxApplicationRunner and in other places. Simplify remote linux runconfiguration Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp')
-rw-r--r--src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 9198f1f692..d9b3742ec4 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -27,17 +27,16 @@
**
**
**************************************************************************/
+
#include "abstractremotelinuxdeploystep.h"
#include "abstractremotelinuxdeployservice.h"
-#include "linuxdeviceconfiguration.h"
#include "remotelinuxdeployconfiguration.h"
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/profileinformation.h>
#include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
using namespace ProjectExplorer;
@@ -85,9 +84,7 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
bool AbstractRemoteLinuxDeployStep::init()
{
QString error;
- deployService()->setDeviceConfiguration(ProjectExplorer::DeviceProfileInformation::device(target()->profile())
- .dynamicCast<const LinuxDeviceConfiguration>());
- deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
+ deployService()->setBuildConfiguration(target()->activeBuildConfiguration());
const bool canDeploy = initInternal(&error);
if (!canDeploy)
emit addOutput(tr("Cannot deploy: %1").arg(error), ErrorMessageOutput);
@@ -138,7 +135,7 @@ void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
{
emit addOutput(message, ErrorMessageOutput);
emit addTask(Task(Task::Error, message, Utils::FileName(), -1,
- Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
+ Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
d->hasError = true;
}
@@ -146,7 +143,7 @@ void AbstractRemoteLinuxDeployStep::handleWarningMessage(const QString &message)
{
emit addOutput(message, ErrorMessageOutput);
emit addTask(Task(Task::Warning, message, Utils::FileName(), -1,
- Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
+ Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
}
void AbstractRemoteLinuxDeployStep::handleFinished()