Commit 766e9c1e authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Add Qemu settings page.

Put it in new top-level "Maemo" category, along
with the Maemo device configurations.

Reviewed-by: kh1
parent 93e5942d
......@@ -66,6 +66,13 @@ static const QLatin1String UserEnvironmentChangesKey(PREFIX ".UserEnvironmentCha
static const QLatin1String UseRemoteGdbKey(PREFIX ".UseRemoteGdb");
} // namespace Internal
namespace Constants {
const char * const MAEMO_SETTINGS_CATEGORY = "X.Maemo";
const char * const MAEMO_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Maemo");
const char * const MAEMO_SETTINGS_CATEGORY_ICON = ":/projectexplorer/images/MaemoDevice.png";
}
} // namespace Qt4ProjectManager
#endif // MAEMOCONSTANTS_H
......@@ -211,7 +211,7 @@ const MaemoPackageCreationStep *MaemoDeployStep::packagingStep() const
void MaemoDeployStep::raiseError(const QString &errorString)
{
emit addTask(Task(Task::Error, errorString, QString(), -1,
Constants::TASK_CATEGORY_BUILDSYSTEM));
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
emit error();
}
......
......@@ -32,9 +32,9 @@
**
****************************************************************************/
#include "maemosettingswidget.h"
#include "maemodeviceconfigurationssettingswidget.h"
#include "ui_maemosettingswidget.h"
#include "ui_maemodeviceconfigurationssettingswidget.h"
#include "maemoconfigtestdialog.h"
#include "maemodeviceconfigurations.h"
......@@ -102,9 +102,9 @@ private:
};
MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
MaemoDeviceConfigurationsSettingsWidget::MaemoDeviceConfigurationsSettingsWidget(QWidget *parent)
: QWidget(parent),
m_ui(new Ui_MaemoSettingsWidget),
m_ui(new Ui_MaemoDeviceConfigurationsSettingsWidget),
m_devConfs(MaemoDeviceConfigurations::instance().devConfigs()),
m_nameValidator(new NameValidator(m_devConfs)),
m_saveSettingsRequested(false)
......@@ -112,7 +112,7 @@ MaemoSettingsWidget::MaemoSettingsWidget(QWidget *parent)
initGui();
}
MaemoSettingsWidget::~MaemoSettingsWidget()
MaemoDeviceConfigurationsSettingsWidget::~MaemoDeviceConfigurationsSettingsWidget()
{
if (m_saveSettingsRequested) {
Core::ICore::instance()->settings()->setValue(LastDeviceConfigIndexKey,
......@@ -122,7 +122,7 @@ MaemoSettingsWidget::~MaemoSettingsWidget()
delete m_ui;
}
QString MaemoSettingsWidget::searchKeywords() const
QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
{
QString rc;
QTextStream(&rc) << m_ui->configurationLabel->text()
......@@ -149,7 +149,7 @@ QString MaemoSettingsWidget::searchKeywords() const
return rc;
}
void MaemoSettingsWidget::initGui()
void MaemoDeviceConfigurationsSettingsWidget::initGui()
{
m_ui->setupUi(this);
m_ui->nameLineEdit->setValidator(m_nameValidator);
......@@ -168,7 +168,7 @@ void MaemoSettingsWidget::initGui()
currentConfigChanged(m_ui->configurationComboBox->currentIndex());
}
void MaemoSettingsWidget::addConfig()
void MaemoDeviceConfigurationsSettingsWidget::addConfig()
{
const QString prefix = tr("New Device Configuration %1", "Standard "
"Configuration name with number");
......@@ -187,7 +187,7 @@ void MaemoSettingsWidget::addConfig()
m_ui->configurationComboBox->setFocus();
}
void MaemoSettingsWidget::deleteConfig()
void MaemoDeviceConfigurationsSettingsWidget::deleteConfig()
{
const int selectedItem = m_ui->configurationComboBox->currentIndex();
m_devConfs.removeAt(selectedItem);
......@@ -195,7 +195,7 @@ void MaemoSettingsWidget::deleteConfig()
Q_ASSERT(m_ui->configurationComboBox->count() == m_devConfs.count());
}
void MaemoSettingsWidget::display(const MaemoDeviceConfig &devConfig)
void MaemoDeviceConfigurationsSettingsWidget::display(const MaemoDeviceConfig &devConfig)
{
MaemoDeviceConfig *otherConfig;
if (devConfig.type == MaemoDeviceConfig::Physical) {
......@@ -227,7 +227,7 @@ void MaemoSettingsWidget::display(const MaemoDeviceConfig &devConfig)
fillInValues();
}
void MaemoSettingsWidget::fillInValues()
void MaemoDeviceConfigurationsSettingsWidget::fillInValues()
{
m_ui->nameLineEdit->setText(currentConfig().name);
m_ui->hostLineEdit->setText(currentConfig().server.host);
......@@ -245,13 +245,13 @@ void MaemoSettingsWidget::fillInValues()
m_ui->sshPortSpinBox->setReadOnly(isSimulator);
}
void MaemoSettingsWidget::saveSettings()
void MaemoDeviceConfigurationsSettingsWidget::saveSettings()
{
// We must defer this step because of a stupid bug on MacOS. See QTCREATORBUG-1675.
m_saveSettingsRequested = true;
}
MaemoDeviceConfig &MaemoSettingsWidget::currentConfig()
MaemoDeviceConfig &MaemoDeviceConfigurationsSettingsWidget::currentConfig()
{
Q_ASSERT(m_ui->configurationComboBox->count() == m_devConfs.count());
const int currenIndex = m_ui->configurationComboBox->currentIndex();
......@@ -260,7 +260,7 @@ MaemoDeviceConfig &MaemoSettingsWidget::currentConfig()
return m_devConfs[currenIndex];
}
void MaemoSettingsWidget::configNameEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
{
if (m_ui->configurationComboBox->count() == 0)
return;
......@@ -272,7 +272,7 @@ void MaemoSettingsWidget::configNameEditingFinished()
m_nameValidator->setDisplayName(newName);
}
void MaemoSettingsWidget::deviceTypeChanged()
void MaemoDeviceConfigurationsSettingsWidget::deviceTypeChanged()
{
const QString name = currentConfig().name;
const MaemoDeviceConfig::DeviceType devType =
......@@ -291,7 +291,7 @@ void MaemoSettingsWidget::deviceTypeChanged()
fillInValues();
}
void MaemoSettingsWidget::authenticationTypeChanged()
void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
{
const bool usePassword = m_ui->passwordButton->isChecked();
currentConfig().server.authType
......@@ -302,73 +302,73 @@ void MaemoSettingsWidget::authenticationTypeChanged()
m_ui->keyLabel->setEnabled(!usePassword);
}
void MaemoSettingsWidget::hostNameEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::hostNameEditingFinished()
{
currentConfig().server.host = m_ui->hostLineEdit->text();
}
void MaemoSettingsWidget::sshPortEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::sshPortEditingFinished()
{
currentConfig().server.port = m_ui->sshPortSpinBox->value();
}
void MaemoSettingsWidget::handleFreePortsChanged()
void MaemoDeviceConfigurationsSettingsWidget::handleFreePortsChanged()
{
currentConfig().portsSpec = m_ui->portsLineEdit->text();
updatePortsWarningLabel();
}
void MaemoSettingsWidget::timeoutEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::timeoutEditingFinished()
{
currentConfig().server.timeout = m_ui->timeoutSpinBox->value();
}
void MaemoSettingsWidget::userNameEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::userNameEditingFinished()
{
currentConfig().server.uname = m_ui->userLineEdit->text();
}
void MaemoSettingsWidget::passwordEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::passwordEditingFinished()
{
currentConfig().server.pwd = m_ui->pwdLineEdit->text();
}
void MaemoSettingsWidget::keyFileEditingFinished()
void MaemoDeviceConfigurationsSettingsWidget::keyFileEditingFinished()
{
currentConfig().server.privateKeyFile = m_ui->keyFileLineEdit->path();
}
void MaemoSettingsWidget::showPassword(bool showClearText)
void MaemoDeviceConfigurationsSettingsWidget::showPassword(bool showClearText)
{
m_ui->pwdLineEdit->setEchoMode(showClearText
? QLineEdit::Normal : QLineEdit::Password);
}
void MaemoSettingsWidget::testConfig()
void MaemoDeviceConfigurationsSettingsWidget::testConfig()
{
QDialog *dialog = new MaemoConfigTestDialog(currentConfig(), this);
dialog->open();
}
void MaemoSettingsWidget::showGenerateSshKeyDialog()
void MaemoDeviceConfigurationsSettingsWidget::showGenerateSshKeyDialog()
{
MaemoSshConfigDialog dialog(this);
dialog.exec();
}
void MaemoSettingsWidget::showRemoteProcesses()
void MaemoDeviceConfigurationsSettingsWidget::showRemoteProcesses()
{
MaemoRemoteProcessesDialog dlg(currentConfig().server, this);
dlg.exec();
}
void MaemoSettingsWidget::setPrivateKey(const QString &path)
void MaemoDeviceConfigurationsSettingsWidget::setPrivateKey(const QString &path)
{
m_ui->keyFileLineEdit->setPath(path);
keyFileEditingFinished();
}
void MaemoSettingsWidget::deployKey()
void MaemoDeviceConfigurationsSettingsWidget::deployKey()
{
if (m_keyDeployer)
return;
......@@ -408,7 +408,7 @@ void MaemoSettingsWidget::deployKey()
m_keyDeployer->run(command);
}
void MaemoSettingsWidget::handleConnectionFailure()
void MaemoDeviceConfigurationsSettingsWidget::handleConnectionFailure()
{
if (!m_keyDeployer)
return;
......@@ -419,7 +419,7 @@ void MaemoSettingsWidget::handleConnectionFailure()
stopDeploying();
}
void MaemoSettingsWidget::handleKeyUploadFinished(int exitStatus)
void MaemoDeviceConfigurationsSettingsWidget::handleKeyUploadFinished(int exitStatus)
{
Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart
|| exitStatus == SshRemoteProcess::KilledBySignal
......@@ -440,7 +440,7 @@ void MaemoSettingsWidget::handleKeyUploadFinished(int exitStatus)
stopDeploying();
}
void MaemoSettingsWidget::stopDeploying()
void MaemoDeviceConfigurationsSettingsWidget::stopDeploying()
{
if (m_keyDeployer) {
disconnect(m_keyDeployer.data(), 0, this, 0);
......@@ -451,7 +451,7 @@ void MaemoSettingsWidget::stopDeploying()
connect(m_ui->deployKeyButton, SIGNAL(clicked()), this, SLOT(deployKey()));
}
void MaemoSettingsWidget::currentConfigChanged(int index)
void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
{
stopDeploying();
if (index == -1) {
......@@ -471,7 +471,7 @@ void MaemoSettingsWidget::currentConfigChanged(int index)
}
}
void MaemoSettingsWidget::clearDetails()
void MaemoDeviceConfigurationsSettingsWidget::clearDetails()
{
m_ui->hostLineEdit->clear();
m_ui->sshPortSpinBox->clear();
......@@ -482,7 +482,7 @@ void MaemoSettingsWidget::clearDetails()
m_ui->portsWarningLabel->clear();
}
void MaemoSettingsWidget::updatePortsWarningLabel()
void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
{
if (currentConfig().freePorts().hasMore()) {
m_ui->portsWarningLabel->clear();
......
......@@ -32,8 +32,8 @@
**
****************************************************************************/
#ifndef MAEMOSETTINGSWIDGET_H
#define MAEMOSETTINGSWIDGET_H
#ifndef MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
#define MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
#include "maemodeviceconfigurations.h"
......@@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
class QLineEdit;
class Ui_MaemoSettingsWidget;
class Ui_MaemoDeviceConfigurationsSettingsWidget;
QT_END_NAMESPACE
namespace Core {
......@@ -57,12 +57,12 @@ namespace Internal {
class NameValidator;
class MaemoSettingsWidget : public QWidget
class MaemoDeviceConfigurationsSettingsWidget : public QWidget
{
Q_OBJECT
public:
MaemoSettingsWidget(QWidget *parent);
~MaemoSettingsWidget();
MaemoDeviceConfigurationsSettingsWidget(QWidget *parent);
~MaemoDeviceConfigurationsSettingsWidget();
void saveSettings();
QString searchKeywords() const;
......@@ -105,7 +105,7 @@ private:
void fillInValues();
void updatePortsWarningLabel();
Ui_MaemoSettingsWidget *m_ui;
Ui_MaemoDeviceConfigurationsSettingsWidget *m_ui;
QList<MaemoDeviceConfig> m_devConfs;
MaemoDeviceConfig m_lastConfigHW;
MaemoDeviceConfig m_lastConfigSim;
......@@ -117,4 +117,4 @@ private:
} // namespace Internal
} // namespace Qt4ProjectManager
#endif // MAEMOSETTINGSWIDGET_H
#endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MaemoSettingsWidget</class>
<widget class="QWidget" name="MaemoSettingsWidget">
<class>MaemoDeviceConfigurationsSettingsWidget</class>
<widget class="QWidget" name="MaemoDeviceConfigurationsSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
......@@ -409,7 +409,7 @@
<connection>
<sender>deviceButton</sender>
<signal>clicked(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>deviceTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -425,7 +425,7 @@
<connection>
<sender>hostLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>hostNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -441,7 +441,7 @@
<connection>
<sender>userLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>userNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -457,7 +457,7 @@
<connection>
<sender>pwdLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>passwordEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -473,7 +473,7 @@
<connection>
<sender>simulatorButton</sender>
<signal>clicked(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>deviceTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -489,7 +489,7 @@
<connection>
<sender>addConfigButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>addConfig()</slot>
<hints>
<hint type="sourcelabel">
......@@ -505,7 +505,7 @@
<connection>
<sender>removeConfigButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>deleteConfig()</slot>
<hints>
<hint type="sourcelabel">
......@@ -521,7 +521,7 @@
<connection>
<sender>passwordButton</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -537,7 +537,7 @@
<connection>
<sender>keyFileLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -553,7 +553,7 @@
<connection>
<sender>keyFileLineEdit</sender>
<signal>browsingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -569,7 +569,7 @@
<connection>
<sender>testConfigButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>testConfig()</slot>
<hints>
<hint type="sourcelabel">
......@@ -585,7 +585,7 @@
<connection>
<sender>deployKeyButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>deployKey()</slot>
<hints>
<hint type="sourcelabel">
......@@ -601,7 +601,7 @@
<connection>
<sender>keyButton</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -617,7 +617,7 @@
<connection>
<sender>nameLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>configNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -633,7 +633,7 @@
<connection>
<sender>generateKeyButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>showGenerateSshKeyDialog()</slot>
<hints>
<hint type="sourcelabel">
......@@ -649,7 +649,7 @@
<connection>
<sender>timeoutSpinBox</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>timeoutEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -665,7 +665,7 @@
<connection>
<sender>timeoutSpinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>timeoutEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -681,7 +681,7 @@
<connection>
<sender>sshPortSpinBox</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>sshPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -697,7 +697,7 @@
<connection>
<sender>sshPortSpinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>sshPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -713,7 +713,7 @@
<connection>
<sender>showPasswordCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>showPassword(bool)</slot>
<hints>
<hint type="sourcelabel">
......@@ -729,7 +729,7 @@
<connection>
<sender>portsLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>handleFreePortsChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -745,7 +745,7 @@
<connection>
<sender>remoteProcessesButton</sender>
<signal>clicked()</signal>
<receiver>MaemoSettingsWidget</receiver>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<slot>showRemoteProcesses()</slot>
<hints>
<hint type="sourcelabel">
......
......@@ -37,7 +37,7 @@
#include "maemopublishingwizardfactories.h"
#include "maemoqemumanager.h"
#include "maemorunfactories.h"
#include "maemosettingspage.h"
#include "maemosettingspages.h"
#include "maemotemplatesmanager.h"
#include "maemotoolchain.h"
......@@ -62,7 +62,8 @@ MaemoManager::MaemoManager()
, m_runConfigurationFactory(new MaemoRunConfigurationFactory(this))
, m_packageCreationFactory(new MaemoPackageCreationFactory(this))
, m_deployStepFactory(new MaemoDeployStepFactory(this))
, m_settingsPage(new MaemoSettingsPage(this))
, m_deviceConfigurationsSettingsPage(new MaemoDeviceConfigurationsSettingsPage(this))
, m_qemuSettingsPage(new MaemoQemuSettingsPage(this))
, m_publishingFactoryFremantleFree(new MaemoPublishingWizardFactoryFremantleFree(this))
{
Q_ASSERT(!m_instance);
......@@ -77,18 +78,21 @@ MaemoManager::MaemoManager()
pluginManager->addObject(m_runConfigurationFactory);
pluginManager->addObject(m_packageCreationFactory);
pluginManager->addObject(m_deployStepFactory);
pluginManager->addObject(m_settingsPage);
pluginManager->addObject(m_deviceConfigurationsSettingsPage);
pluginManager->addObject(m_qemuSettingsPage);
pluginManager->addObject(m_publishingFactoryFremantleFree);
}
MaemoManager::~MaemoManager()
{
// TODO: Remove in reverse order of adding.
PluginManager *pluginManager = PluginManager::instance();
pluginManager->removeObject(m_runControlFactory);
pluginManager->removeObject(m_runConfigurationFactory);
pluginManager->removeObject(m_deployStepFactory);
pluginManager->removeObject(m_packageCreationFactory);
pluginManager->removeObject(m_settingsPage);
pluginManager->removeObject(m_deviceConfigurationsSettingsPage);
pluginManager->removeObject(m_qemuSettingsPage);
pluginManager->removeObject(m_publishingFactoryFremantleFree);
m_instance = 0;
......
......@@ -46,8 +46,9 @@ class MaemoPackageCreationFactory;
class MaemoPublishingWizardFactoryFremantleFree;
class MaemoRunControlFactory;
class MaemoRunConfigurationFactory;
class MaemoSettingsPage;
class MaemoDeviceConfigurationsSettingsPage;
class MaemoQemuManager;
class MaemoQemuSettingsPage;
class MaemoManager : public QObject
{
......@@ -61,7 +62,8 @@ public:
bool isValidMaemoQtVersion(const Qt4ProjectManager::QtVersion *version) const;
ToolChain *maemoToolChain(const Qt4ProjectManager::QtVersion *version) const;
MaemoSettingsPage *settingsPage() const { return m_settingsPage; }
MaemoDeviceConfigurationsSettingsPage *deviceConfigurationsSettingsPage() const { return m_deviceConfigurationsSettingsPage; }
MaemoQemuSettingsPage *qemuSettingsPage() const { return m_qemuSettingsPage; }
private:
static MaemoManager *m_instance;
......@@ -70,7 +72,8 @@ private:
MaemoRunConfigurationFactory *m_runConfigurationFactory;
MaemoPackageCreationFactory *m_packageCreationFactory;
MaemoDeployStepFactory *m_deployStepFactory;
MaemoSettingsPage *m_settingsPage;
MaemoDeviceConfigurationsSettingsPage *m_deviceConfigurationsSettingsPage;
MaemoQemuSettingsPage *m_qemuSettingsPage;
MaemoQemuManager *m_qemuRuntimeManager;