aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-07-19 17:30:37 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2011-07-19 17:35:56 +0200
commit1656335edba1af91aed7da9697b0a775f65aabee (patch)
treeefe3bf2aa3b4a422887127d39d04e15f5e6f6103 /src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
parent410d5bd0cf3ab20bf1bdc4a90635effcb3921d48 (diff)
RemoteLinux: Remove Maemo dependency from generic package installation.
Change-Id: I3c62fe77656fed22b4de287430b0b13190e274a9 Reviewed-on: http://codereview.qt.nokia.com/1839 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp')
-rw-r--r--src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
index 358384b4a33..badc2554af0 100644
--- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
+++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
@@ -33,9 +33,8 @@
#include "deployablefile.h"
#include "linuxdeviceconfiguration.h"
-#include "maemopackagecreationstep.h"
-#include "maemopackageinstaller.h"
#include "maemopackageuploader.h"
+#include "remotelinuxpackageinstaller.h"
#include <utils/qtcassert.h>
#include <utils/ssh/sshconnection.h>
@@ -163,7 +162,7 @@ void AbstractUploadAndInstallPackageService::handleUploadFinished(const QString
connect(packageInstaller(), SIGNAL(stderrData(QString)), SIGNAL(stdErrData(QString)));
connect(packageInstaller(), SIGNAL(finished(QString)),
SLOT(handleInstallationFinished(QString)));
- packageInstaller()->installPackage(connection(), deviceConfiguration(), remoteFilePath, true);
+ packageInstaller()->installPackage(connection(), remoteFilePath, true);
}
void AbstractUploadAndInstallPackageService::handleInstallationFinished(const QString &errorMsg)