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

Maemo: Introduce class for maemo-global functions.

Browse Source
This commit is contained in:
ck
2010-07-13 17:00:12 +02:00
parent 9bd53be4c9
commit e17b99e7f3
8 changed files with 115 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -32,6 +32,7 @@
#include "maemoconstants.h"
#include "maemodeployables.h"
#include "maemodeploystepwidget.h"
#include "maemoglobal.h"
#include "maemopackagecreationstep.h"
#include "maemorunconfiguration.h"
@@ -191,7 +192,7 @@ void MaemoDeployStep::stop()
QString MaemoDeployStep::uploadDir() const
{
return homeDirOnDevice(m_connection->connectionParameters().uname);
return MaemoGlobal::homeDirOnDevice(m_connection->connectionParameters().uname);
}
bool MaemoDeployStep::currentlyNeedsDeployment(const QString &host,
@@ -350,7 +351,7 @@ void MaemoDeployStep::handleSftpJobFinished(Core::SftpJobId job,
.arg(deployInfo.first.localFilePath));
const QString remoteFilePath = deployInfo.first.remoteDir + '/'
+ QFileInfo(deployInfo.first.localFilePath).fileName();
QByteArray linkCommand = remoteSudo().toUtf8() + " ln -sf "
QByteArray linkCommand = MaemoGlobal::remoteSudo().toUtf8() + " ln -sf "
+ deployInfo.second.toUtf8() + ' ' + remoteFilePath.toUtf8();
SshRemoteProcess::Ptr linkProcess
= m_connection->createRemoteProcess(linkCommand);
@@ -397,8 +398,8 @@ void MaemoDeployStep::handleLinkProcessFinished(int exitStatus)
writeOutput(tr("Installing package ..."));
const QString packageFileName
= QFileInfo(packagingStep()->packageFilePath()).fileName();
const QByteArray cmd = remoteSudo().toUtf8() + " dpkg -i "
+ packageFileName.toUtf8();
const QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8()
+ " dpkg -i " + packageFileName.toUtf8();
m_installer = m_connection->createRemoteProcess(cmd);
connect(m_installer.data(), SIGNAL(closed(int)), this,
SLOT(handleInstallationFinished(int)));