m_mounter->resetMountSpecifications();
setState(Inactive);
break;
- case UnmountingOldDirs: {
- const Qt4BuildConfiguration * const bc
- = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
- if (MaemoGlobal::allowsRemoteMounts(bc->qtVersion()))
+ case UnmountingOldDirs:
+ if (maemotarget()->allowsRemoteMounts())
setupMount();
else
prepareSftpConnection();
break;
- }
case UnmountingCurrentDirs:
setState(GatheringPorts);
m_portsGatherer->start(m_connection, m_cachedDeviceConfig->freePorts());
return static_cast<AbstractMaemoToolChain *>(bc->toolChain());
}
+const AbstractQt4MaemoTarget *MaemoDeployStep::maemotarget() const
+{
+ const Qt4BuildConfiguration * const bc
+ = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
+ return static_cast<AbstractQt4MaemoTarget *>(bc->target());
+}
+
void MaemoDeployStep::handleSysrootInstallerOutput()
{
ASSERT_STATE(QList<State>() << InstallingToSysroot << StopRequested);
const MaemoPackageCreationStep *packagingStep() const;
QString deployMountPoint() const;
const AbstractMaemoToolChain *toolChain() const;
+ const AbstractQt4MaemoTarget *maemotarget() const;
void copyNextFileToDevice();
void installToSysroot();
QString uploadDir() const;
static QString targetName(const QtVersion *qtVersion);
static QString madCommand(const QtVersion *qtVersion);
static MaemoVersion version(const QtVersion *qtVersion);
- static bool allowsRemoteMounts(const QtVersion *qtVersion) { return version(qtVersion) == Maemo5; }
- static bool allowsPackagingDisabling(const QtVersion *qtVersion) { return version(qtVersion) == Maemo5; }
- static bool allowsQmlDebugging(const QtVersion *qtVersion) { return version(qtVersion) == Maemo6; }
static bool callMad(QProcess &proc, const QStringList &args,
const QtVersion *qtVersion);
bool MaemoPackageCreationStep::isPackagingEnabled() const
{
- return m_packagingEnabled
- || !MaemoGlobal::allowsPackagingDisabling(qt4BuildConfiguration()->qtVersion());
+ return m_packagingEnabled || !maemoTarget()->allowsPackagingDisabling();
}
QString MaemoPackageCreationStep::versionString(QString *error) const
{
const Qt4BuildConfiguration * const bc = m_step->qt4BuildConfiguration();
if (bc) {
- m_ui->skipCheckBox->setVisible(MaemoGlobal::allowsPackagingDisabling(
- bc->qtVersion()));
+ m_ui->skipCheckBox->setVisible(m_step->maemoTarget()->allowsPackagingDisabling());
m_ui->skipCheckBox->setChecked(!m_step->isPackagingEnabled());
}
#include "maemoglobal.h"
#include "maemousedportsgatherer.h"
+#include "qt4maemotarget.h"
#include <coreplugin/ssh/sftpchannel.h>
#include <coreplugin/ssh/sshconnection.h>
{
ASSERT_STATE(Inactive);
const QtVersion * const qtVersion = bc->qtVersion();
- m_remoteMountsAllowed = MaemoGlobal::allowsRemoteMounts(qtVersion);
+ m_remoteMountsAllowed
+ = qobject_cast<AbstractQt4MaemoTarget *>(bc->target())->allowsRemoteMounts();
m_maddeRoot = MaemoGlobal::maddeRoot(qtVersion);
}
bool MaemoRunConfiguration::useRemoteGdb() const
{
- return m_useRemoteGdb
- && MaemoGlobal::allowsRemoteMounts(activeQt4BuildConfiguration()->qtVersion());
+ return m_useRemoteGdb && maemoTarget()->allowsRemoteMounts();
}
void MaemoRunConfiguration::setArguments(const QString &args)
MaemoRunConfiguration::DebuggingType MaemoRunConfiguration::debuggingType() const
{
- if (!MaemoGlobal::allowsQmlDebugging(activeQt4BuildConfiguration()->qtVersion()))
+ if (!maemoTarget()->allowsQmlDebugging())
return DebugCppOnly;
if (useCppDebugger()) {
if (useQmlDebugger())
void MaemoRunConfigurationWidget::handleToolchainChanged()
{
- const Qt4BuildConfiguration * const bc
- = m_runConfiguration->activeQt4BuildConfiguration();
- if (bc) {
- const QtVersion * const qtVersion = bc->qtVersion();
- const bool remoteMountsAvailable
- = MaemoGlobal::allowsRemoteMounts(qtVersion);
+ const AbstractQt4MaemoTarget * const maemoTarget
+ = m_runConfiguration->maemoTarget();
+ if (maemoTarget) {
+ const bool remoteMountsAvailable = maemoTarget->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable);
- const bool qmlDebuggingAvailable
- = MaemoGlobal::allowsQmlDebugging(qtVersion);
+ const bool qmlDebuggingAvailable = maemoTarget->allowsQmlDebugging();
m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
return false;
const int freePortCount = maemoRunConfig->freePorts().count();
- const QtVersion * const qtVersion
- = maemoRunConfig->activeQt4BuildConfiguration()->qtVersion();
- const bool remoteMountsAllowed = MaemoGlobal::allowsRemoteMounts(qtVersion);
+ const bool remoteMountsAllowed
+ = maemoRunConfig->maemoTarget()->allowsRemoteMounts();
if (remoteMountsAllowed && freePortCount == 0)
return false;
const int mountDirCount
QString shortDescription() const;
bool setShortDescription(const QString &description);
+ virtual bool allowsRemoteMounts() const=0;
+ virtual bool allowsPackagingDisabling() const=0;
+ virtual bool allowsQmlDebugging() const=0;
+
signals:
void debianDirContentsChanged();
void changeLogChanged();
private:
virtual QString debianDirName() const;
+ virtual bool allowsRemoteMounts() const { return true; }
+ virtual bool allowsPackagingDisabling() const { return true; }
+ virtual bool allowsQmlDebugging() const { return false; }
};
class Qt4HarmattanTarget : public AbstractQt4MaemoTarget
private:
virtual QString debianDirName() const;
+ virtual bool allowsRemoteMounts() const { return false; }
+ virtual bool allowsPackagingDisabling() const { return false; }
+ virtual bool allowsQmlDebugging() const { return true; }
};
} // namespace Internal