diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
index 6694209eba7c12ffece37747227d7c96b2d6f3d7..4fc4c4af4767be7d6eb36c76a5e9eb60448626fb 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
@@ -65,6 +65,7 @@ static const QLatin1String LastDeployedHostsKey(PREFIX ".LastDeployedHosts");
static const QLatin1String LastDeployedFilesKey(PREFIX ".LastDeployedFiles");
static const QLatin1String LastDeployedRemotePathsKey(PREFIX ".LastDeployedRemotePaths");
static const QLatin1String LastDeployedTimesKey(PREFIX ".LastDeployedTimes");
+static const QLatin1String DeployToSysrootKey(PREFIX ".DeployToSysroot");
static const QLatin1String ProFileKey(PREFIX ".ProFile");
static const QLatin1String ExportedLocalDirsKey(PREFIX ".ExportedLocalDirs");
static const QLatin1String RemoteMountPointsKey(PREFIX ".RemoteMountPoints");
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 68521df70eee1ecf438f324c626d6d9862f107f3..e0b355483622bd161d3da347bcdc2006bb898a22 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -93,6 +93,13 @@ void MaemoDeployStep::ctor()
m_deviceConfigModel = new MaemoDeviceConfigListModel(this);
#ifdef DEPLOY_VIA_MOUNT
m_canStart = true;
+ m_sysrootInstaller = new QProcess(this);
+ connect(m_sysrootInstaller, SIGNAL(finished(int,QProcess::ExitStatus)),
+ this, SLOT(handleSysrootInstallerFinished()));
+ connect(m_sysrootInstaller, SIGNAL(readyReadStandardOutput()), this,
+ SLOT(handleSysrootInstallerOutput()));
+ connect(m_sysrootInstaller, SIGNAL(readyReadStandardError()), this,
+ SLOT(handleSysrootInstallerErrorOutput()));
m_cleanupTimer = new QTimer(this);
m_cleanupTimer->setSingleShot(true);
connect(m_cleanupTimer, SIGNAL(timeout()), this,
@@ -134,6 +141,9 @@ QVariantMap MaemoDeployStep::toMap() const
{
QVariantMap map(BuildStep::toMap());
addDeployTimesToMap(map);
+#ifdef DEPLOY_VIA_MOUNT
+ map.insert(DeployToSysrootKey, m_deployToSysroot);
+#endif
map.unite(m_deviceConfigModel->toMap());
return map;
}
@@ -163,6 +173,9 @@ bool MaemoDeployStep::fromMap(const QVariantMap &map)
return false;
getDeployTimesFromMap(map);
m_deviceConfigModel->fromMap(map);
+#ifdef DEPLOY_VIA_MOUNT
+ m_deployToSysroot = map.value(DeployToSysrootKey, true).toBool();
+#endif
return true;
}
@@ -201,8 +214,7 @@ void MaemoDeployStep::raiseError(const QString &errorString)
emit error();
}
-void MaemoDeployStep::writeOutput(const QString &text,
- BuildStep::OutputFormat format)
+void MaemoDeployStep::writeOutput(const QString &text, OutputFormat format)
{
emit addOutput(text, format);
}
@@ -214,10 +226,10 @@ void MaemoDeployStep::stop()
return;
if (m_connecting || m_needsInstall || !m_filesToCopy.isEmpty()
- || (m_installer && m_installer->isRunning())
+ || (m_deviceInstaller && m_deviceInstaller->isRunning())
|| m_currentDeployAction) {
if (m_connection && m_connection->state() == SshConnection::Connected
- && ((m_installer && m_installer->isRunning())
+ && ((m_deviceInstaller && m_deviceInstaller->isRunning())
|| m_currentDeployAction)) {
const QByteArray programToKill
= m_currentDeployAction ? "cp" : "dpkg";
@@ -228,17 +240,21 @@ void MaemoDeployStep::stop()
killProc->start();
}
m_stopped = true;
+ m_unmountState = CurrentMountsUnmount;
m_canStart = false;
m_needsInstall = false;
m_filesToCopy.clear();
m_connecting = false;
+ m_sysrootInstaller->terminate();
+ m_sysrootInstaller->waitForFinished(500);
+ m_sysrootInstaller->kill();
m_cleanupTimer->start(5000);
m_mounter->stop();
}
#else
m_stopped = true;
- if (m_installer && m_installer->isRunning()) {
- disconnect(m_installer.data(), 0, this, 0);
+ if (m_deviceInstaller && m_deviceInstaller->isRunning()) {
+ disconnect(m_deviceInstaller.data(), 0, this, 0);
}
else if (!m_uploadsInProgress.isEmpty() || !m_linksInProgress.isEmpty()) {
m_uploadsInProgress.clear();
@@ -348,6 +364,7 @@ void MaemoDeployStep::handleConnected()
}
if (m_needsInstall || !m_filesToCopy.isEmpty()) {
+ m_unmountState = OldDirsUnmount;
m_mounter->setConnection(m_connection);
m_mounter->unmount(); // Clean up potential remains.
} else {
@@ -513,15 +530,15 @@ void MaemoDeployStep::handleLinkProcessFinished(int exitStatus)
= QFileInfo(packagingStep()->packageFilePath()).fileName();
const QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8()
+ " dpkg -i " + packageFileName.toUtf8();
- m_installer = m_connection->createRemoteProcess(cmd);
- connect(m_installer.data(), SIGNAL(closed(int)), this,
+ m_deviceInstaller = m_connection->createRemoteProcess(cmd);
+ connect(m_deviceInstaller.data(), SIGNAL(closed(int)), this,
SLOT(handleInstallationFinished(int)));
- connect(m_installer.data(), SIGNAL(outputAvailable(QByteArray)),
- this, SLOT(handleInstallerOutput(QByteArray)));
- connect(m_installer.data(),
+ connect(m_deviceInstaller.data(), SIGNAL(outputAvailable(QByteArray)),
+ this, SLOT(handleDeviceInstallerOutput(QByteArray)));
+ connect(m_deviceInstaller.data(),
SIGNAL(errorOutputAvailable(QByteArray)), this,
- SLOT(handleInstallerErrorOutput(QByteArray)));
- m_installer->start();
+ SLOT(handleDeviceInstallerErrorOutput(QByteArray)));
+ m_deviceInstaller->start();
} else {
emit done();
}
@@ -538,20 +555,10 @@ void MaemoDeployStep::handleMounted()
}
if (m_needsInstall) {
- writeOutput(tr("Installing package ..."));
- const QString packageFileName
- = QFileInfo(packagingStep()->packageFilePath()).fileName();
- const QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8() + " dpkg -i "
- + deployMountPoint().toUtf8() + '/' + packageFileName.toUtf8();
- m_installer = m_connection->createRemoteProcess(cmd);
- connect(m_installer.data(), SIGNAL(closed(int)), this,
- SLOT(handleInstallationFinished(int)));
- connect(m_installer.data(), SIGNAL(outputAvailable(QByteArray)),
- this, SLOT(handleInstallerOutput(QByteArray)));
- connect(m_installer.data(),
- SIGNAL(errorOutputAvailable(QByteArray)), this,
- SLOT(handleInstallerErrorOutput(QByteArray)));
- m_installer->start();
+ if (m_deployToSysroot)
+ installToSysroot();
+ else
+ installToDevice();
} else {
deployNextFile();
}
@@ -559,58 +566,66 @@ void MaemoDeployStep::handleMounted()
void MaemoDeployStep::handleUnmounted()
{
- m_mounter->resetMountSpecifications();
if (m_stopped) {
+ m_mounter->resetMountSpecifications();
m_canStart = true;
return;
}
- if (m_needsInstall || !m_filesToCopy.isEmpty()) {
- m_mounter->setPortList(deviceConfig().freePorts());
- if (m_needsInstall) {
- const QString localDir = QFileInfo(packagingStep()->packageFilePath())
- .absolutePath();
- const MaemoMountSpecification mountSpec(localDir,
- deployMountPoint());
- if (!addMountSpecification(mountSpec))
- return;
- } else {
+ if (m_unmountState == CurrentDirsUnmount) {
+ m_mounter->mount();
+ return;
+ }
+
+ if (m_unmountState == CurrentMountsUnmount) {
+ writeOutput(tr("Deployment finished."));
+ emit done();
+ return;
+ }
+
+ Q_ASSERT(m_needsInstall || !m_filesToCopy.isEmpty());
+ m_mounter->resetMountSpecifications();
+ m_mounter->setPortList(deviceConfig().freePorts());
+ if (m_needsInstall) {
+ const QString localDir
+ = QFileInfo(packagingStep()->packageFilePath()).absolutePath();
+ const MaemoMountSpecification mountSpec(localDir, deployMountPoint());
+ if (!addMountSpecification(mountSpec))
+ return;
+ } else {
#ifdef Q_OS_WIN
- bool drivesToMount[26];
- for (int i = 0; i < sizeof drivesToMount / sizeof drivesToMount[0]; ++i)
- drivesToMount[i] = false;
- for (int i = 0; i < m_filesToCopy.count(); ++i) {
- const QString localDir = QFileInfo(m_filesToCopy.at(i).localFilePath)
- .canonicalPath();
- const char driveLetter = localDir.at(0).toLower().toLatin1();
- if (driveLetter < 'a' || driveLetter > 'z') {
- qWarning("Weird: drive letter is '%c'.", driveLetter);
- continue;
- }
-
- const int index = driveLetter - 'a';
- if (drivesToMount[index])
- continue;
-
- const QString mountPoint = deployMountPoint()
- + QLatin1Char('/') + QLatin1Char(driveLetter);
- const MaemoMountSpecification mountSpec(localDir.left(3),
- mountPoint);
- if (!addMountSpecification(mountSpec))
- return;
- drivesToMount[index] = true;
+ bool drivesToMount[26];
+ for (int i = 0; i < sizeof drivesToMount / sizeof drivesToMount[0]; ++i)
+ drivesToMount[i] = false;
+ for (int i = 0; i < m_filesToCopy.count(); ++i) {
+ const QString localDir
+ = QFileInfo(m_filesToCopy.at(i).localFilePath).canonicalPath();
+ const char driveLetter = localDir.at(0).toLower().toLatin1();
+ if (driveLetter < 'a' || driveLetter > 'z') {
+ qWarning("Weird: drive letter is '%c'.", driveLetter);
+ continue;
}
-#else
- if (!addMountSpecification(MaemoMountSpecification(QLatin1String("/"),
- deployMountPoint())))
+
+ const int index = driveLetter - 'a';
+ if (drivesToMount[index])
+ continue;
+
+ const QString mountPoint = deployMountPoint() + QLatin1Char('/')
+ + QLatin1Char(driveLetter);
+ const MaemoMountSpecification mountSpec(localDir.left(3),
+ mountPoint);
+ if (!addMountSpecification(mountSpec))
return;
-#endif
+ drivesToMount[index] = true;
}
- m_mounter->mount();
- } else {
- writeOutput(tr("Deployment finished."));
- emit done();
+#else
+ if (!addMountSpecification(MaemoMountSpecification(QLatin1String("/"),
+ deployMountPoint())))
+ return;
+#endif
}
+ m_unmountState = CurrentDirsUnmount;
+ m_mounter->unmount();
}
void MaemoDeployStep::handleMountError(const QString &errorMsg)
@@ -621,6 +636,49 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg)
raiseError(errorMsg);
}
+void MaemoDeployStep::installToSysroot()
+{
+ writeOutput(tr("Installing package to sysroot ..."));
+ const MaemoToolChain * const tc = toolChain();
+ const QStringList args = QStringList() << QLatin1String("-t")
+ << tc->targetName() << QLatin1String("xdpkg") << QLatin1String("-i")
+ << packagingStep()->packageFilePath();
+ m_sysrootInstaller->start(tc->madAdminCommand(), args);
+ if (!m_sysrootInstaller->waitForStarted()) {
+ writeOutput(tr("Installation to sysroot failed, continuing anyway."),
+ ErrorMessageOutput);
+ installToDevice();
+ }
+}
+
+void MaemoDeployStep::handleSysrootInstallerFinished()
+{
+ if (m_sysrootInstaller->error() != QProcess::UnknownError
+ || m_sysrootInstaller->exitCode() != 0) {
+ writeOutput(tr("Installation to sysroot failed, continuing anyway."),
+ ErrorMessageOutput);
+ }
+ installToDevice();
+}
+
+void MaemoDeployStep::installToDevice()
+{
+ writeOutput(tr("Installing package to device..."));
+ const QString packageFileName
+ = QFileInfo(packagingStep()->packageFilePath()).fileName();
+ const QByteArray cmd = MaemoGlobal::remoteSudo().toUtf8() + " dpkg -i "
+ + deployMountPoint().toUtf8() + '/' + packageFileName.toUtf8();
+ m_deviceInstaller = m_connection->createRemoteProcess(cmd);
+ connect(m_deviceInstaller.data(), SIGNAL(closed(int)), this,
+ SLOT(handleInstallationFinished(int)));
+ connect(m_deviceInstaller.data(), SIGNAL(outputAvailable(QByteArray)),
+ this, SLOT(handleDeviceInstallerOutput(QByteArray)));
+ connect(m_deviceInstaller.data(),
+ SIGNAL(errorOutputAvailable(QByteArray)), this,
+ SLOT(handleDeviceInstallerErrorOutput(QByteArray)));
+ m_deviceInstaller->start();
+}
+
void MaemoDeployStep::handleProgressReport(const QString &progressMsg)
{
writeOutput(progressMsg);
@@ -640,13 +698,15 @@ void MaemoDeployStep::deployNextFile()
sourceFilePath += d.localFilePath;
#endif
+ // TODO: Copy file to sysroot
+
QString command = QString::fromLatin1("%1 cp -r %2 %3")
.arg(MaemoGlobal::remoteSudo(), sourceFilePath,
d.remoteDir + QLatin1Char('/'));
SshRemoteProcess::Ptr copyProcess
= m_connection->createRemoteProcess(command.toUtf8());
connect(copyProcess.data(), SIGNAL(errorOutputAvailable(QByteArray)),
- this, SLOT(handleInstallerErrorOutput(QByteArray)));
+ this, SLOT(handleDeviceInstallerErrorOutput(QByteArray)));
connect(copyProcess.data(), SIGNAL(closed(int)), this,
SLOT(handleCopyProcessFinished(int)));
m_currentDeployAction.reset(new DeployAction(d, copyProcess));
@@ -685,6 +745,7 @@ void MaemoDeployStep::handleCopyProcessFinished(int exitStatus)
m_currentDeployAction.reset(0);
if (m_filesToCopy.isEmpty()) {
writeOutput(tr("All files copied."));
+ m_unmountState = CurrentMountsUnmount;
m_mounter->unmount();
} else {
deployNextFile();
@@ -699,8 +760,8 @@ void MaemoDeployStep::handleCleanupTimeout()
"explicitly enabling re-start.", Q_FUNC_INFO);
m_canStart = true;
disconnect(m_connection.data(), 0, this, 0);
- if (m_installer)
- disconnect(m_installer.data(), 0, this, 0);
+ if (m_deviceInstaller)
+ disconnect(m_deviceInstaller.data(), 0, this, 0);
if (m_currentDeployAction)
disconnect(m_currentDeployAction->second.data(), 0, this, 0);
}
@@ -711,6 +772,29 @@ QString MaemoDeployStep::deployMountPoint() const
return MaemoGlobal::homeDirOnDevice(deviceConfig().server.uname)
+ QLatin1String("/deployMountPoint");
}
+
+const MaemoToolChain *MaemoDeployStep::toolChain() const
+{
+ const Qt4BuildConfiguration * const bc
+ = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
+ return static_cast<MaemoToolChain *>(bc->toolChain());
+}
+
+void MaemoDeployStep::handleSysrootInstallerOutput()
+{
+ if (!m_stopped) {
+ writeOutput(QString::fromLocal8Bit(m_sysrootInstaller->readAllStandardOutput()),
+ NormalOutput);
+ }
+}
+
+void MaemoDeployStep::handleSysrootInstallerErrorOutput()
+{
+ if (!m_stopped) {
+ writeOutput(QString::fromLocal8Bit(m_sysrootInstaller->readAllStandardError()),
+ BuildStep::ErrorOutput);
+ }
+}
#endif
void MaemoDeployStep::handleInstallationFinished(int exitStatus)
@@ -722,7 +806,7 @@ void MaemoDeployStep::handleInstallationFinished(int exitStatus)
}
if (exitStatus != SshRemoteProcess::ExitedNormally
- || m_installer->exitCode() != 0) {
+ || m_deviceInstaller->exitCode() != 0) {
raiseError(tr("Installing package failed."));
} else {
m_needsInstall = false;
@@ -730,13 +814,14 @@ void MaemoDeployStep::handleInstallationFinished(int exitStatus)
MaemoDeployable(packagingStep()->packageFilePath(), QString()));
writeOutput(tr("Package installed."));
}
+ m_unmountState = CurrentMountsUnmount;
m_mounter->unmount();
#else
if (m_stopped)
return;
if (exitStatus != SshRemoteProcess::ExitedNormally
- || m_installer->exitCode() != 0) {
+ || m_deviceInstaller->exitCode() != 0) {
raiseError(tr("Installing package failed."));
} else {
writeOutput(tr("Package installation finished."));
@@ -745,17 +830,16 @@ void MaemoDeployStep::handleInstallationFinished(int exitStatus)
#endif
}
-void MaemoDeployStep::handleInstallerOutput(const QByteArray &output)
+void MaemoDeployStep::handleDeviceInstallerOutput(const QByteArray &output)
{
- writeOutput(QString::fromUtf8(output));
+ writeOutput(QString::fromUtf8(output), NormalOutput);
}
-void MaemoDeployStep::handleInstallerErrorOutput(const QByteArray &output)
+void MaemoDeployStep::handleDeviceInstallerErrorOutput(const QByteArray &output)
{
- writeOutput(output, BuildStep::ErrorOutput);
+ writeOutput(QString::fromUtf8(output), ErrorOutput);
}
-
MaemoDeployEventHandler::MaemoDeployEventHandler(MaemoDeployStep *deployStep,
QFutureInterface<bool> &future)
: m_deployStep(deployStep), m_future(future), m_eventLoop(new QEventLoop)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
index f6fbc4ccedf8edb0237ee2ce553336733d0ec279..ff1cfb29e851605ef4db8ad8c28a3a23de166c16 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
@@ -48,6 +48,7 @@
QT_BEGIN_NAMESPACE
class QEventLoop;
#ifdef DEPLOY_VIA_MOUNT
+class QProcess;
class QTimer;
#endif
QT_END_NAMESPACE
@@ -68,6 +69,7 @@ class MaemoRemoteMounter;
class MaemoDeployables;
class MaemoDeviceConfigListModel;
class MaemoPackageCreationStep;
+class MaemoToolChain;
class MaemoDeployStep : public ProjectExplorer::BuildStep
{
@@ -85,6 +87,11 @@ public:
MaemoDeployables *deployables() const { return m_deployables; }
QSharedPointer<Core::SshConnection> sshConnection() const { return m_connection; }
+#ifdef DEPLOY_VIA_MOUNT
+ bool deployToSysroot() const { return m_deployToSysroot; }
+ void setDeployToSysroot(bool deploy) { m_deployToSysroot = deploy; }
+#endif
+
signals:
void done();
void error();
@@ -101,6 +108,9 @@ private slots:
void handleProgressReport(const QString &progressMsg);
void handleCopyProcessFinished(int exitStatus);
void handleCleanupTimeout();
+ void handleSysrootInstallerFinished();
+ void handleSysrootInstallerOutput();
+ void handleSysrootInstallerErrorOutput();
#else
void handleSftpChannelInitialized();
void handleSftpChannelInitializationFailed(const QString &error);
@@ -108,8 +118,8 @@ private slots:
void handleLinkProcessFinished(int exitStatus);
#endif
void handleInstallationFinished(int exitStatus);
- void handleInstallerOutput(const QByteArray &output);
- void handleInstallerErrorOutput(const QByteArray &output);
+ void handleDeviceInstallerOutput(const QByteArray &output);
+ void handleDeviceInstallerErrorOutput(const QByteArray &output);
private:
MaemoDeployStep(ProjectExplorer::BuildStepList *bc,
@@ -123,19 +133,19 @@ private:
void ctor();
void raiseError(const QString &error);
- void writeOutput(const QString &text, ProjectExplorer::BuildStep::OutputFormat = BuildStep::NormalOutput);
+ void writeOutput(const QString &text, OutputFormat = MessageOutput);
void addDeployTimesToMap(QVariantMap &map) const;
void getDeployTimesFromMap(const QVariantMap &map);
const MaemoPackageCreationStep *packagingStep() const;
#ifdef DEPLOY_VIA_MOUNT
QString deployMountPoint() const;
+ const MaemoToolChain *toolChain() const;
void deployNextFile();
bool addMountSpecification(const MaemoMountSpecification &mountSpec);
+ void installToSysroot();
+ void installToDevice();
#else
bool deploy(const MaemoDeployable &deployable);
-#endif
-
-#ifndef DEPLOY_VIA_MOUNT
QString uploadDir() const;
#endif
@@ -144,19 +154,23 @@ private:
MaemoDeployables * const m_deployables;
QSharedPointer<Core::SshConnection> m_connection;
#ifdef DEPLOY_VIA_MOUNT
+ QProcess *m_sysrootInstaller;
typedef QPair<MaemoDeployable, QSharedPointer<Core::SshRemoteProcess> > DeployAction;
QScopedPointer<DeployAction> m_currentDeployAction;
QList<MaemoDeployable> m_filesToCopy;
MaemoRemoteMounter *m_mounter;
QTimer *m_cleanupTimer;
bool m_canStart;
+ bool m_deployToSysroot;
+ enum UnmountState { OldDirsUnmount, CurrentDirsUnmount, CurrentMountsUnmount };
+ UnmountState m_unmountState;
#else
QSharedPointer<Core::SftpChannel> m_uploader;
typedef QPair<MaemoDeployable, QString> DeployInfo;
QMap<Core::SftpJobId, DeployInfo> m_uploadsInProgress;
QMap<QSharedPointer<Core::SshRemoteProcess>, MaemoDeployable> m_linksInProgress;
#endif
- QSharedPointer<Core::SshRemoteProcess> m_installer;
+ QSharedPointer<Core::SshRemoteProcess> m_deviceInstaller;
bool m_stopped;
bool m_needsInstall;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
index 409116d28e5dc34c7c3cfdb85ac8125c285649b0..1bd5b2625fb3ddcfe63dd12a52debcabee363687 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
@@ -39,6 +39,13 @@ void MaemoDeployStepWidget::init()
this, SLOT(handleDeviceConfigModelChanged()));
connect(ui->deviceConfigComboBox, SIGNAL(activated(int)), this,
SLOT(setCurrentDeviceConfig(int)));
+#ifdef DEPLOY_VIA_MOUNT
+ ui->deployToSysrootCheckBox->setChecked(m_step->deployToSysroot());
+ connect(ui->deployToSysrootCheckBox, SIGNAL(toggled(bool)), this,
+ SLOT(setDeployToSysroot(bool)));
+#else
+ ui->deployToSysrootCheckBox->hide();
+#endif
handleDeviceConfigModelChanged();
}
@@ -91,5 +98,14 @@ void MaemoDeployStepWidget::setCurrentDeviceConfig(int index)
m_step->deviceConfigModel()->setCurrentIndex(index);
}
+void MaemoDeployStepWidget::setDeployToSysroot(bool doDeploy)
+{
+#ifdef DEPLOY_VIA_MOUNT
+ m_step->setDeployToSysroot(doDeploy);
+#else
+ Q_UNUSED(doDeploy)
+#endif
+}
+
} // namespace Internal
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
index d5eff9ee7ec8273f132fa18b9063845442e7c69a..133e79f778b75f45744fedfbe12717a90d26f20c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
@@ -26,6 +26,7 @@ private:
Q_SLOT void handleModelsCreated();
Q_SLOT void handleDeviceConfigModelChanged();
Q_SLOT void setCurrentDeviceConfig(int index);
+ Q_SLOT void setDeployToSysroot(bool doDeloy);
virtual void init();
virtual QString summaryText() const;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
index ffeb6abf3631d1f29156376500719f84838171e1..0f803b4d5e73037bd863c06cd95789a20ad46b86 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
@@ -46,6 +46,13 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"/>
</item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="deployToSysrootCheckBox">
+ <property name="text">
+ <string>Also deploy to sysroot</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 28782ce9bae006a942e1ee3555e80baa973835a2..3d8d8d75a898d28bf9355537d70858da440f01bc 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -49,7 +49,6 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent,
m_utfsServerTimer(new QTimer(this)), m_uploadJobId(SftpInvalidJob),
m_stop(false)
{
- m_utfsServerTimer->setSingleShot(true);
connect(m_utfsServerTimer, SIGNAL(timeout()), this,
SLOT(handleUtfsServerTimeout()));
}
@@ -236,7 +235,7 @@ void MaemoRemoteMounter::startUtfsClients()
const QString chmod = QString::fromLocal8Bit("%1 chmod a+r+w+x %2")
.arg(MaemoGlobal::remoteSudo(), mountSpec.remoteMountPoint);
QString utfsClient
- = QString::fromLocal8Bit("%1 -l %2 -r %2 -b %2 %4")
+ = QString::fromLocal8Bit("%1 -l %2 -r %2 -b %2 %4 -o nonempty")
.arg(utfsClientOnDevice()).arg(mountInfo.remotePort)
.arg(mountSpec.remoteMountPoint);
if (mountInfo.mountAsRoot)