forked from qt-creator/qt-creator
Maemo: Device configurations now have a list of free ports.
The device configuration widget is now the only place the user ever has to specify ports.
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "maemodeployable.h"
|
||||
#include "maemodeviceconfigurations.h"
|
||||
#include "maemomountspecification.h"
|
||||
|
||||
#include <coreplugin/ssh/sftpdefs.h>
|
||||
#include <projectexplorer/buildstep.h>
|
||||
@@ -81,10 +82,6 @@ public:
|
||||
const MaemoDeployable &deployable) const;
|
||||
void setDeployed(const QString &host, const MaemoDeployable &deployable);
|
||||
MaemoDeployables *deployables() const { return m_deployables; }
|
||||
#ifdef DEPLOY_VIA_MOUNT
|
||||
int mountPort() const { return m_mountPort; }
|
||||
void setMountPort(int port) { m_mountPort = port; }
|
||||
#endif
|
||||
|
||||
signals:
|
||||
void done();
|
||||
@@ -131,6 +128,7 @@ private:
|
||||
#ifdef DEPLOY_VIA_MOUNT
|
||||
QString deployMountPoint() const;
|
||||
void deployNextFile();
|
||||
bool addMountSpecification(const MaemoMountSpecification &mountSpec);
|
||||
#else
|
||||
bool deploy(const MaemoDeployable &deployable);
|
||||
#endif
|
||||
@@ -150,7 +148,6 @@ private:
|
||||
MaemoRemoteMounter *m_mounter;
|
||||
QTimer *m_cleanupTimer;
|
||||
bool m_canStart;
|
||||
int m_mountPort;
|
||||
#else
|
||||
QSharedPointer<Core::SftpChannel> m_uploader;
|
||||
typedef QPair<MaemoDeployable, QString> DeployInfo;
|
||||
|
||||
Reference in New Issue
Block a user