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

Maemo: Have only one MaemoDeployables object per Maemo target.

Browse Source 
It does not depend on any of the settings in the deploy configuration.

Task-number: QTCREATORBUG-2678
This commit is contained in:
Christian Kandeler
2010-10-27 10:50:52 +02:00
parent 2c907fb5b1
commit fe72f7c2f9
6 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
View File

@@ -31,6 +31,7 @@
#define MAEMODEPLOYSTEP_H
#include "maemodeployable.h"
#include "maemodeployables.h"
#include "maemodeviceconfigurations.h"
#include "maemomountspecification.h"
@@ -58,7 +59,6 @@ class SshRemoteProcess;
namespace Qt4ProjectManager {
namespace Internal {
class MaemoRemoteMounter;
class MaemoDeployables;
class MaemoDeviceConfigListModel;
class MaemoPackageCreationStep;
class MaemoToolChain;
@@ -76,7 +76,7 @@ public:
bool currentlyNeedsDeployment(const QString &host,
const MaemoDeployable &deployable) const;
void setDeployed(const QString &host, const MaemoDeployable &deployable);
MaemoDeployables *deployables() const { return m_deployables; }
QSharedPointer<MaemoDeployables> deployables() const { return m_deployables; }
QSharedPointer<Core::SshConnection> sshConnection() const { return m_connection; }
bool isDeployToSysrootEnabled() const { return m_deployToSysroot; }
@@ -138,7 +138,7 @@ private:
static const QLatin1String Id;
MaemoDeployables * const m_deployables;
QSharedPointer<MaemoDeployables> m_deployables;
QSharedPointer<Core::SshConnection> m_connection;
QProcess *m_sysrootInstaller;
typedef QPair<MaemoDeployable, QSharedPointer<Core::SshRemoteProcess> > DeviceDeployAction;