plugin_qmljstools \
plugin_macros \
debugger/dumper.pro \
- plugin_qmlprofiler
+ plugin_qmlprofiler \
+ plugin_remotelinux
!win32 {
SUBDIRS += plugin_valgrind
plugin_qt4projectmanager.depends += plugin_cpptools
plugin_qt4projectmanager.depends += plugin_debugger
plugin_qt4projectmanager.depends += plugin_qmljseditor
-plugin_qt4projectmanager.depends += plugin_analyzerbase
+
+plugin_remotelinux.subdir = remotelinux
+plugin_remotelinux.depends = plugin_analyzerbase
+plugin_remotelinux.depends += plugin_coreplugin
+plugin_remotelinux.depends += plugin_debugger
+plugin_remotelinux.depends += plugin_projectexplorer
+plugin_remotelinux.depends += plugin_qt4projectmanager
plugin_locator.subdir = locator
plugin_locator.depends = plugin_coreplugin
#include <projectexplorer/nodesvisitor.h>
namespace Qt4ProjectManager {
-namespace Internal {
-
class Qt4ProFileNode;
+namespace Internal {
class FindQt4ProFiles: protected ProjectExplorer::NodesVisitor {
#include "addlibrarywizard.h"
namespace Qt4ProjectManager {
+class Qt4ProFileNode;
namespace Internal {
namespace Ui {
class LibraryDetailsWidget;
}
-class Qt4ProFileNode;
-
class LibraryDetailsController : public QObject
{
Q_OBJECT
**************************************************************************/
#include "qmakestep.h"
+#include "ui_qmakestep.h"
#include <projectexplorer/projectexplorerconstants.h>
#include "qmakeparser.h"
////
QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
- : BuildStepConfigWidget(), m_step(step), m_ignoreChange(false)
+ : BuildStepConfigWidget(), m_ui(new Ui::QMakeStep), m_step(step),
+ m_ignoreChange(false)
{
- m_ui.setupUi(this);
- connect(m_ui.qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
+ m_ui->setupUi(this);
+ connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
this, SLOT(qmakeArgumentsLineEdited()));
- connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
+ connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(buildConfigurationSelected()));
- connect(m_ui.qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
+ connect(m_ui->qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
this, SLOT(linkQmlDebuggingLibraryChecked(bool)));
- connect(m_ui.qmlDebuggingWarningText, SIGNAL(linkActivated(QString)),
+ connect(m_ui->qmlDebuggingWarningText, SIGNAL(linkActivated(QString)),
this, SLOT(buildQmlDebuggingHelper()));
connect(step, SIGNAL(userArgumentsChanged()),
this, SLOT(userArgumentsChanged()));
this, SLOT(qtVersionsDumpUpdated(QString)));
}
+QMakeStepConfigWidget::~QMakeStepConfigWidget()
+{
+ delete m_ui;
+}
+
void QMakeStepConfigWidget::init()
{
- m_ui.qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
- m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
+ m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
+ m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
qmakeBuildConfigChanged();
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
bool debug = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;
m_ignoreChange = true;
- m_ui.buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
+ m_ui->buildConfigurationComboBox->setCurrentIndex(debug? 0 : 1);
m_ignoreChange = false;
updateSummaryLabel();
updateEffectiveQMakeCall();
{
if (m_ignoreChange)
return;
- m_ui.qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
+ m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
updateSummaryLabel();
updateEffectiveQMakeCall();
}
{
if (m_ignoreChange)
return;
- m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
+ m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
updateSummaryLabel();
updateEffectiveQMakeCall();
void QMakeStepConfigWidget::qmakeArgumentsLineEdited()
{
m_ignoreChange = true;
- m_step->setUserArguments(m_ui.qmakeAdditonalArgumentsLineEdit->text());
+ m_step->setUserArguments(m_ui->qmakeAdditonalArgumentsLineEdit->text());
m_ignoreChange = false;
updateSummaryLabel();
return;
Qt4BuildConfiguration *bc = m_step->qt4BuildConfiguration();
QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
- if (m_ui.buildConfigurationComboBox->currentIndex() == 0) { // debug
+ if (m_ui->buildConfigurationComboBox->currentIndex() == 0) { // debug
buildConfiguration = buildConfiguration | QtSupport::BaseQtVersion::DebugBuild;
} else {
buildConfiguration = buildConfiguration & ~QtSupport::BaseQtVersion::DebugBuild;
void QMakeStepConfigWidget::updateQmlDebuggingOption()
{
- m_ui.qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
+ m_ui->qmlDebuggingLibraryCheckBox->setEnabled(m_step->isQmlDebuggingLibrarySupported());
QtSupport::BaseQtVersion *qtVersion = m_step->qt4BuildConfiguration()->qtVersion();
if (!qtVersion || !qtVersion->needsQmlDebuggingLibrary())
- m_ui.debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
+ m_ui->debuggingLibraryLabel->setText(tr("Enable QML debugging:"));
else
- m_ui.debuggingLibraryLabel->setText(tr("Link QML debugging library:"));
+ m_ui->debuggingLibraryLabel->setText(tr("Link QML debugging library:"));
QString warningText;
else if (m_step->linkQmlDebuggingLibrary())
warningText = tr("Might make your application vulnerable. Only use in a safe environment!");
- m_ui.qmlDebuggingWarningText->setText(warningText);
- m_ui.qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
+ m_ui->qmlDebuggingWarningText->setText(warningText);
+ m_ui->qmlDebuggingWarningIcon->setVisible(!warningText.isEmpty());
}
void QMakeStepConfigWidget::updateEffectiveQMakeCall()
QString program = tr("<No qtversion>");
if (qtVersion)
program = QFileInfo(qtVersion->qmakeCommand()).fileName();
- m_ui.qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + m_step->allArguments());
+ m_ui->qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + m_step->allArguments());
}
////
#ifndef QMAKESTEP_H
#define QMAKESTEP_H
-#include "ui_qmakestep.h"
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+namespace Ui { class QMakeStep; }
+QT_END_NAMESPACE
#include <projectexplorer/abstractprocessstep.h>
Q_OBJECT
public:
QMakeStepConfigWidget(QMakeStep *step);
+ ~QMakeStepConfigWidget();
void init();
QString summaryText() const;
QString displayName() const;
void updateSummaryLabel();
void updateQmlDebuggingOption();
void updateEffectiveQMakeCall();
- Ui::QMakeStep m_ui;
+ Ui::QMakeStep *m_ui;
QMakeStep *m_step;
QString m_summaryText;
bool m_ignoreChange;
emit isEnabledChanged(!enabled);
}
-void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
{
if (m_proFilePath != pro->path())
return;
emit effectiveTargetInformationChanged();
}
-void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
{
if (pro->path() != m_proFilePath)
return;
connect(qt4Target(), SIGNAL(environmentChanged()),
this, SIGNAL(baseEnvironmentChanged()));
- connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SLOT(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
+ connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+ this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)));
- connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+ connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
+ this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
}
//////
class Qt4Project;
class Qt4BaseTarget;
+class Qt4ProFileNode;
namespace Internal {
class Qt4DesktopTarget;
class Qt4PriFileNode;
-class Qt4ProFileNode;
class Qt4RunConfigurationFactory;
class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
void effectiveTargetInformationChanged();
private slots:
- void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+ void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
protected:
Qt4RunConfiguration(Qt4BaseTarget *parent, Qt4RunConfiguration *source);
+++ /dev/null
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
-
-#include "maemomanager.h"
-
-#include "maemoconstants.h"
-#include "maemodeployable.h"
-#include "maemodeploystepfactory.h"
-#include "maemodeviceconfigurations.h"
-#include "maemoglobal.h"
-#include "maemopackagecreationfactory.h"
-#include "maemopublishingwizardfactories.h"
-#include "maemoqemumanager.h"
-#include "maemorunfactories.h"
-#include "maemosettingspages.h"
-#include "maemotoolchain.h"
-#include "qt4maemodeployconfiguration.h"
-#include "maemoqtversionfactory.h"
-#include "qt4maemotargetfactory.h"
-#include "qt4projectmanager/qt4projectmanagerconstants.h"
-
-#include <extensionsystem/pluginmanager.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-
-using namespace ExtensionSystem;
-using namespace ProjectExplorer;
-
-namespace Qt4ProjectManager {
- namespace Internal {
-
-MaemoManager *MaemoManager::m_instance = 0;
-
-MaemoManager::MaemoManager()
- : QObject(0)
- , m_runControlFactory(new MaemoRunControlFactory(this))
- , m_runConfigurationFactory(new MaemoRunConfigurationFactory(this))
- , m_deployConfigurationFactory(new Qt4MaemoDeployConfigurationFactory(this))
- , m_packageCreationFactory(new MaemoPackageCreationFactory(this))
- , m_deployStepFactory(new MaemoDeployStepFactory(this))
- , m_deviceConfigurationsSettingsPage(new MaemoDeviceConfigurationsSettingsPage(this))
- , m_qemuSettingsPage(new MaemoQemuSettingsPage(this))
- , m_publishingFactoryFremantleFree(new MaemoPublishingWizardFactoryFremantleFree(this))
- , m_maemoTargetFactory(new Qt4MaemoTargetFactory(this))
- , m_toolChainFactory(new MaemoToolChainFactory)
- , m_maemoQtVersionFactory(new MaemoQtVersionFactory(this))
-{
- Q_ASSERT(!m_instance);
-
- m_instance = this;
- MaemoQemuManager::instance(this);
- MaemoDeviceConfigurations::instance(this);
-
- PluginManager *pluginManager = PluginManager::instance();
- pluginManager->addObject(m_toolChainFactory);
- pluginManager->addObject(m_runControlFactory);
- pluginManager->addObject(m_runConfigurationFactory);
- pluginManager->addObject(m_deployConfigurationFactory);
- pluginManager->addObject(m_packageCreationFactory);
- pluginManager->addObject(m_deployStepFactory);
- pluginManager->addObject(m_deviceConfigurationsSettingsPage);
- pluginManager->addObject(m_qemuSettingsPage);
- pluginManager->addObject(m_publishingFactoryFremantleFree);
- pluginManager->addObject(m_maemoTargetFactory);
- pluginManager->addObject(m_maemoQtVersionFactory);
-
- qRegisterMetaType<MaemoDeployable>("MaemoDeployable");
-}
-
-MaemoManager::~MaemoManager()
-{
- PluginManager *pluginManager = PluginManager::instance();
- pluginManager->removeObject(m_maemoQtVersionFactory);
- pluginManager->removeObject(m_maemoTargetFactory);
- pluginManager->removeObject(m_publishingFactoryFremantleFree);
- pluginManager->removeObject(m_qemuSettingsPage);
- pluginManager->removeObject(m_deviceConfigurationsSettingsPage);
- pluginManager->removeObject(m_deployStepFactory);
- pluginManager->removeObject(m_packageCreationFactory);
- pluginManager->removeObject(m_deployConfigurationFactory);
- pluginManager->removeObject(m_runConfigurationFactory);
- pluginManager->removeObject(m_runControlFactory);
- pluginManager->removeObject(m_toolChainFactory);
- delete m_toolChainFactory;
-
- m_instance = 0;
-}
-
-MaemoManager &MaemoManager::instance()
-{
- Q_ASSERT(m_instance);
- return *m_instance;
-}
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
+++ /dev/null
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
-
-#ifndef MAEMOMANAGER_H
-#define MAEMOMANAGER_H
-
-#include <QtCore/QObject>
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-class MaemoDeployStepFactory;
-class MaemoPackageCreationFactory;
-class MaemoPublishingWizardFactoryFremantleFree;
-class MaemoRunControlFactory;
-class MaemoRunConfigurationFactory;
-class MaemoDeviceConfigurationsSettingsPage;
-class MaemoQemuManager;
-class MaemoQemuSettingsPage;
-class Qt4MaemoDeployConfigurationFactory;
-class Qt4MaemoTargetFactory;
-class MaemoToolChainFactory;
-class MaemoQtVersionFactory;
-
-class MaemoManager : public QObject
-{
- Q_OBJECT
-
-public:
- MaemoManager();
- ~MaemoManager();
- static MaemoManager &instance();
-
- MaemoDeviceConfigurationsSettingsPage *deviceConfigurationsSettingsPage() const { return m_deviceConfigurationsSettingsPage; }
- MaemoQemuSettingsPage *qemuSettingsPage() const { return m_qemuSettingsPage; }
-
-private:
- static MaemoManager *m_instance;
-
- MaemoRunControlFactory *m_runControlFactory;
- MaemoRunConfigurationFactory *m_runConfigurationFactory;
- Qt4MaemoDeployConfigurationFactory *m_deployConfigurationFactory;
- MaemoPackageCreationFactory *m_packageCreationFactory;
- MaemoDeployStepFactory *m_deployStepFactory;
- MaemoDeviceConfigurationsSettingsPage *m_deviceConfigurationsSettingsPage;
- MaemoQemuSettingsPage *m_qemuSettingsPage;
- MaemoQemuManager *m_qemuRuntimeManager;
- MaemoPublishingWizardFactoryFremantleFree *m_publishingFactoryFremantleFree;
- Qt4MaemoTargetFactory *m_maemoTargetFactory;
- MaemoToolChainFactory *m_toolChainFactory;
- MaemoQtVersionFactory *m_maemoQtVersionFactory;
-};
-
- } // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // MAEMOMANAGER_H
+++ /dev/null
-HEADERS += \
- $$PWD/maemoconfigtestdialog.h \
- $$PWD/maemoconstants.h \
- $$PWD/maemodeviceconfigurations.h \
- $$PWD/maemomanager.h \
- $$PWD/maemorunconfiguration.h \
- $$PWD/maemorunconfigurationwidget.h \
- $$PWD/maemoruncontrol.h \
- $$PWD/maemorunfactories.h \
- $$PWD/maemosettingspages.h \
- $$PWD/maemodeviceconfigurationssettingswidget.h \
- $$PWD/maemosshconfigdialog.h \
- $$PWD/maemotoolchain.h \
- $$PWD/maemopackagecreationstep.h \
- $$PWD/maemopackagecreationfactory.h \
- $$PWD/maemopackagecreationwidget.h \
- $$PWD/maemodeployablelistmodel.h \
- $$PWD/maemoqemumanager.h \
- $$PWD/maemodeployables.h \
- $$PWD/maemodeployable.h \
- $$PWD/maemodeploystepwidget.h \
- $$PWD/maemodeploystepfactory.h \
- $$PWD/maemoglobal.h \
- $$PWD/maemosshrunner.h \
- $$PWD/maemodebugsupport.h \
- $$PWD/maemoanalyzersupport.h \
- $$PWD/maemoremotemountsmodel.h \
- $$PWD/maemodeviceenvreader.h \
- $$PWD/maemomountspecification.h \
- $$PWD/maemoremotemounter.h \
- $$PWD/maemoprofilesupdatedialog.h \
- $$PWD/maemousedportsgatherer.h \
- $$PWD/maemoremoteprocesslist.h \
- $$PWD/maemoremoteprocessesdialog.h \
- $$PWD/maemopublishingwizardfactories.h \
- $$PWD/maemopublishingbuildsettingspagefremantlefree.h \
- $$PWD/maemopublishingfileselectiondialog.h \
- $$PWD/maemopublishedprojectmodel.h \
- $$PWD/maemopublishinguploadsettingspagefremantlefree.h \
- $$PWD/maemopublishingwizardfremantlefree.h \
- $$PWD/maemopublishingresultpagefremantlefree.h \
- $$PWD/maemopublisherfremantlefree.h \
- $$PWD/maemoqemuruntime.h \
- $$PWD/maemoqemuruntimeparser.h \
- $$PWD/maemoqemusettingswidget.h \
- $$PWD/maemoqemusettings.h \
- $$PWD/qt4maemotargetfactory.h \
- $$PWD/qt4maemotarget.h \
- $$PWD/qt4maemodeployconfiguration.h \
- $$PWD/maemodeviceconfigwizard.h \
- $$PWD/maemokeydeployer.h \
- $$PWD/maemopertargetdeviceconfigurationlistmodel.h \
- $$PWD/maemodeployconfigurationwidget.h \
- $$PWD/maemoinstalltosysrootstep.h \
- $$PWD/maemodeploymentmounter.h \
- $$PWD/maemopackageuploader.h \
- $$PWD/maemopackageinstaller.h \
- $$PWD/maemoremotecopyfacility.h \
- $$PWD/abstractmaemodeploystep.h \
- $$PWD/maemodeploybymountstep.h \
- $$PWD/maemouploadandinstalldeploystep.h \
- $$PWD/maemodirectdeviceuploadstep.h \
- $$PWD/abstractlinuxdevicedeploystep.h \
- $$PWD/maemoqtversionfactory.h \
- $$PWD/maemoqtversion.h
-
-SOURCES += \
- $$PWD/maemoconfigtestdialog.cpp \
- $$PWD/maemodeviceconfigurations.cpp \
- $$PWD/maemomanager.cpp \
- $$PWD/maemorunconfiguration.cpp \
- $$PWD/maemorunconfigurationwidget.cpp \
- $$PWD/maemoruncontrol.cpp \
- $$PWD/maemorunfactories.cpp \
- $$PWD/maemosettingspages.cpp \
- $$PWD/maemodeviceconfigurationssettingswidget.cpp \
- $$PWD/maemosshconfigdialog.cpp \
- $$PWD/maemotoolchain.cpp \
- $$PWD/maemopackagecreationstep.cpp \
- $$PWD/maemopackagecreationfactory.cpp \
- $$PWD/maemopackagecreationwidget.cpp \
- $$PWD/maemodeployablelistmodel.cpp \
- $$PWD/maemoqemumanager.cpp \
- $$PWD/maemodeployables.cpp \
- $$PWD/maemodeploystepwidget.cpp \
- $$PWD/maemodeploystepfactory.cpp \
- $$PWD/maemoglobal.cpp \
- $$PWD/maemosshrunner.cpp \
- $$PWD/maemodebugsupport.cpp \
- $$PWD/maemoanalyzersupport.cpp \
- $$PWD/maemoremotemountsmodel.cpp \
- $$PWD/maemodeviceenvreader.cpp \
- $$PWD/maemomountspecification.cpp \
- $$PWD/maemoremotemounter.cpp \
- $$PWD/maemoprofilesupdatedialog.cpp \
- $$PWD/maemousedportsgatherer.cpp \
- $$PWD/maemoremoteprocesslist.cpp \
- $$PWD/maemoremoteprocessesdialog.cpp \
- $$PWD/maemopublishingwizardfactories.cpp \
- $$PWD/maemopublishingbuildsettingspagefremantlefree.cpp \
- $$PWD/maemopublishingfileselectiondialog.cpp \
- $$PWD/maemopublishedprojectmodel.cpp \
- $$PWD/maemopublishinguploadsettingspagefremantlefree.cpp \
- $$PWD/maemopublishingwizardfremantlefree.cpp \
- $$PWD/maemopublishingresultpagefremantlefree.cpp \
- $$PWD/maemopublisherfremantlefree.cpp \
- $$PWD/maemoqemuruntimeparser.cpp \
- $$PWD/maemoqemusettingswidget.cpp \
- $$PWD/maemoqemusettings.cpp \
- $$PWD/qt4maemotargetfactory.cpp \
- $$PWD/qt4maemotarget.cpp \
- $$PWD/qt4maemodeployconfiguration.cpp \
- $$PWD/maemodeviceconfigwizard.cpp \
- $$PWD/maemokeydeployer.cpp \
- $$PWD/maemopertargetdeviceconfigurationlistmodel.cpp \
- $$PWD/maemodeployconfigurationwidget.cpp \
- $$PWD/maemoinstalltosysrootstep.cpp \
- $$PWD/maemodeploymentmounter.cpp \
- $$PWD/maemopackageuploader.cpp \
- $$PWD/maemopackageinstaller.cpp \
- $$PWD/maemoremotecopyfacility.cpp \
- $$PWD/abstractmaemodeploystep.cpp \
- $$PWD/maemodeploybymountstep.cpp \
- $$PWD/maemouploadandinstalldeploystep.cpp \
- $$PWD/maemodirectdeviceuploadstep.cpp \
- $$PWD/abstractlinuxdevicedeploystep.cpp \
- $$PWD/maemoqtversionfactory.cpp \
- $$PWD/maemoqtversion.cpp
-
-FORMS += \
- $$PWD/maemoconfigtestdialog.ui \
- $$PWD/maemodeviceconfigurationssettingswidget.ui \
- $$PWD/maemosshconfigdialog.ui \
- $$PWD/maemopackagecreationwidget.ui \
- $$PWD/maemodeploystepwidget.ui \
- $$PWD/maemoprofilesupdatedialog.ui \
- $$PWD/maemoremoteprocessesdialog.ui \
- $$PWD/maemopublishingbuildsettingspagefremantlefree.ui \
- $$PWD/maemopublishingfileselectiondialog.ui \
- $$PWD/maemopublishinguploadsettingspagefremantlefree.ui \
- $$PWD/maemopublishingresultpagefremantlefree.ui \
- $$PWD/maemoqemusettingswidget.ui \
- $$PWD/maemodeviceconfigwizardstartpage.ui \
- $$PWD/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
- $$PWD/maemodeviceconfigwizardreusekeyscheckpage.ui \
- $$PWD/maemodeviceconfigwizardkeycreationpage.ui \
- $$PWD/maemodeviceconfigwizardkeydeploymentpage.ui \
- $$PWD/maemodeployconfigurationwidget.ui \
- $$PWD/maemodeviceconfigwizardlogindatapage.ui
-
-RESOURCES += $$PWD/qt-maemo.qrc
setDefaultDisplayName(defaultDisplayName());
// TODO disable S60 Deploy Configuration while parsing
// requires keeping track of the parsing state of the project
-// connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
+// connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
// this, SLOT(targetInformationInvalidated()));
- connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+ connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
this, SIGNAL(targetInformationChanged()));
connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
this, SLOT(updateActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
}
namespace Qt4ProjectManager {
+class Qt4ProFileNode;
namespace Internal {
class Qt4SymbianTarget;
-class Qt4ProFileNode;
class S60DeployConfigurationFactory;
class S60DeviceRunConfiguration;
setDefaultDisplayName(tr("Run on Symbian device"));
Qt4Project *pro = qt4Target()->qt4Project();
- connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
- connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
+ connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+ this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+ connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+ this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)));
}
void S60DeviceRunConfiguration::handleParserState(bool success)
emit isEnabledChanged(!enabled);
}
-void S60DeviceRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void S60DeviceRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
{
if (m_proFilePath != pro->path())
return;
handleParserState(false);
}
-void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
{
if (m_proFilePath != pro->path())
return;
namespace Qt4ProjectManager {
class Qt4BaseTarget;
+class Qt4ProFileNode;
namespace Internal {
class SymbianQtVersion;
class Qt4SymbianTarget;
-class Qt4ProFileNode;
class S60DeviceRunConfigurationFactory;
class CodaRunControl;
QString defaultDisplayName() const;
virtual bool fromMap(const QVariantMap &map);
private slots:
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
- void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
+ void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
private:
void ctor();
//: S60 emulator run configuration default display name (no pro-file name)
setDefaultDisplayName(tr("Run on Symbian Emulator"));
Qt4Project *pro = qt4Target()->qt4Project();
- connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
- connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
+ connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+ this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+ connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+ this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)));
}
}
}
-void S60EmulatorRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void S60EmulatorRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
{
if (m_proFilePath != pro->path())
return;
handleParserState(false);
}
-void S60EmulatorRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void S60EmulatorRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
{
if (m_proFilePath != pro->path())
return;
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BaseTarget;
+class Qt4ProFileNode;
namespace Internal {
class Qt4SymbianTarget;
-class Qt4ProFileNode;
class S60EmulatorRunConfigurationFactory;
class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
void targetInformationChanged();
private slots:
- void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+ void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
protected:
S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent, S60EmulatorRunConfiguration *source);
/// If only a sub tree should be build this function returns which sub node
/// should be build
/// \see Qt4BuildConfiguration::setSubNodeBuild
-Qt4ProjectManager::Internal::Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
+Qt4ProjectManager::Qt4ProFileNode *Qt4BuildConfiguration::subNodeBuild() const
{
return m_subNodeBuild;
}
/// calling BuildManager::buildProject( BuildConfiguration * )
/// and reset immediately afterwards
/// That is m_subNodesBuild is set only temporarly
-void Qt4BuildConfiguration::setSubNodeBuild(Qt4ProjectManager::Internal::Qt4ProFileNode *node)
+void Qt4BuildConfiguration::setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node)
{
m_subNodeBuild = node;
}
class MakeStep;
class Qt4BaseTarget;
class Qt4BuildConfigurationFactory;
-
-namespace Internal {
class Qt4ProFileNode;
-}
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
{
QString shadowBuildDirectory() const;
void setShadowBuildAndDirectory(bool shadowBuild, const QString &buildDirectory);
- void setSubNodeBuild(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
- Qt4ProjectManager::Internal::Qt4ProFileNode *subNodeBuild() const;
+ void setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node);
+ Qt4ProjectManager::Qt4ProFileNode *subNodeBuild() const;
// returns the qtVersion
QtSupport::BaseQtVersion *qtVersion() const;
QString m_lastEmmitedBuildDirectory;
int m_qtVersionId;
QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration;
- Qt4ProjectManager::Internal::Qt4ProFileNode *m_subNodeBuild;
+ Qt4ProjectManager::Qt4ProFileNode *m_subNodeBuild;
};
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
filesToRemove << *existingNodeIter;
++existingNodeIter;
} else if ((*existingNodeIter)->path() > *newPathIter) {
- filesToAdd << new FileNode(*newPathIter, type, false);
+ filesToAdd << new ProjectExplorer::FileNode(*newPathIter, type, false);
++newPathIter;
} else { // *existingNodeIter->path() == *newPathIter
++existingNodeIter;
++existingNodeIter;
}
while (newPathIter != files.constEnd()) {
- filesToAdd << new FileNode(*newPathIter, type, false);
+ filesToAdd << new ProjectExplorer::FileNode(*newPathIter, type, false);
++newPathIter;
}
{
// add project file node
if (m_fileNodes.isEmpty())
- addFileNodes(QList<FileNode*>() << new FileNode(m_projectFilePath, ProjectFileType, false), this);
+ addFileNodes(QList<FileNode*>() << new ProjectExplorer::FileNode(m_projectFilePath, ProjectExplorer::ProjectFileType, false), this);
const QString &projectDir = m_qt4ProFileNode->m_projectDir;
break;
}
- FileNode *fileNode = qobject_cast<FileNode *>(node);
+ ProjectExplorer::FileNode *fileNode = qobject_cast<FileNode *>(node);
if (fileNode && fileNode->fileType() != ProjectExplorer::ProjectFileType)
actions << Rename;
return result;
}
+static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
+{
+ switch (type) {
+ case ProFileEvaluator::TT_Unknown:
+ case ProFileEvaluator::TT_Application:
+ return ApplicationTemplate;
+ case ProFileEvaluator::TT_Library:
+ return LibraryTemplate;
+ case ProFileEvaluator::TT_Script:
+ return ScriptTemplate;
+ case ProFileEvaluator::TT_Aux:
+ return AuxTemplate;
+ case ProFileEvaluator::TT_Subdirs:
+ return SubDirsTemplate;
+ default:
+ return InvalidProject;
+ }
+}
+
+namespace {
+ // find all ui files in project
+ class FindUiFileNodesVisitor : public ProjectExplorer::NodesVisitor {
+ public:
+ void visitProjectNode(ProjectNode *projectNode)
+ {
+ visitFolderNode(projectNode);
+ }
+ void visitFolderNode(FolderNode *folderNode)
+ {
+ foreach (FileNode *fileNode, folderNode->fileNodes()) {
+ if (fileNode->fileType() == ProjectExplorer::FormType)
+ uiFileNodes << fileNode;
+ }
+ }
+ QList<FileNode*> uiFileNodes;
+ };
+}
+
+Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
+ : NodesWatcher(parent)
+{
+}
+
+} // namespace Internal
+
const Qt4ProFileNode *Qt4ProFileNode::findProFileFor(const QString &fileName) const
{
{
CPlusPlus::CppModelManagerInterface *modelManager
= CPlusPlus::CppModelManagerInterface::instance();
- QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
end = m_uiCodeModelSupport.constEnd();
for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
modelManager->removeEditorSupport(it.value());
void Qt4ProFileNode::emitProFileUpdated()
{
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->proFileUpdated(this, m_validParse);
foreach (ProjectNode *subNode, subProjectNodes()) {
void Qt4ProFileNode::emitProFileInvalidated()
{
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->proFileInvalidated(this);
foreach (ProjectNode *subNode, subProjectNodes()) {
{
if (m_validParse) {
m_validParse = false;
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->proFileInvalidated(this);
}
m_project->decrementPendingEvaluateFutures();
}
-static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
-{
- switch (type) {
- case ProFileEvaluator::TT_Unknown:
- case ProFileEvaluator::TT_Application:
- return ApplicationTemplate;
- case ProFileEvaluator::TT_Library:
- return LibraryTemplate;
- case ProFileEvaluator::TT_Script:
- return ScriptTemplate;
- case ProFileEvaluator::TT_Aux:
- return AuxTemplate;
- case ProFileEvaluator::TT_Subdirs:
- return SubDirsTemplate;
- default:
- return InvalidProject;
- }
-}
-
void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
{
if (!m_readerExact)
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
invalidate();
}
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->proFileUpdated(this, false);
return;
}
if (debug)
qDebug() << "Qt4ProFileNode - updating files for file " << m_projectFilePath;
- Qt4ProjectType projectType = proFileTemplateTypeToProjectType(
+ Qt4ProjectType projectType = Internal::proFileTemplateTypeToProjectType(
(evalResult == EvalOk ? m_readerExact : m_readerCumulative)->templateType());
if (projectType != m_projectType) {
Qt4ProjectType oldType = m_projectType;
// really emit here? or at the end? Nobody is connected to this signal at the moment
// so we kind of can ignore that question for now
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->projectTypeChanged(this, oldType, projectType);
}
Qt4VariablesHash oldValues = m_varValues;
m_varValues = newVarValues;
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->variablesChanged(this, oldValues, m_varValues);
}
m_validParse = true;
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->proFileUpdated(this, true);
m_project->destroyProFileReader(m_readerExact);
m_readerCumulative = 0;
}
-namespace {
- // find all ui files in project
- class FindUiFileNodesVisitor : public ProjectExplorer::NodesVisitor {
- public:
- void visitProjectNode(ProjectNode *projectNode)
- {
- visitFolderNode(projectNode);
- }
- void visitFolderNode(FolderNode *folderNode)
- {
- foreach (FileNode *fileNode, folderNode->fileNodes()) {
- if (fileNode->fileType() == ProjectExplorer::FormType)
- uiFileNodes << fileNode;
- }
- }
- QList<FileNode*> uiFileNodes;
- };
-}
-
// This function is triggered after a build, and updates the state ui files
// It does so by storing a modification time for each ui file we know about.
return QStringList();
// Find all ui files
- FindUiFileNodesVisitor uiFilesVisitor;
+ Internal::FindUiFileNodesVisitor uiFilesVisitor;
this->accept(&uiFilesVisitor);
- const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
+ const QList<ProjectExplorer::FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
// Find the UiDir, there can only ever be one
QString uiDir = buildDir();
uiDir = tmp.first();
// Collect all existing generated files
- QList<FileNode*> existingFileNodes;
- foreach (FileNode *file, fileNodes()) {
+ QList<ProjectExplorer::FileNode*> existingFileNodes;
+ foreach (ProjectExplorer::FileNode *file, fileNodes()) {
if (file->isGenerated())
existingFileNodes << file;
}
// Convert uiFile to uiHeaderFilePath, find all headers that correspond
// and try to find them in uiDir
QStringList newFilePaths;
- foreach (FileNode *uiFile, uiFiles) {
+ foreach (ProjectExplorer::FileNode *uiFile, uiFiles) {
const QString uiHeaderFilePath
= QString("%1/ui_%2.h").arg(uiDir, QFileInfo(uiFile->path()).completeBaseName());
if (QFileInfo(uiHeaderFilePath).exists())
}
// Create a diff between those lists
- QList<FileNode*> toRemove;
- QList<FileNode*> toAdd;
+ QList<ProjectExplorer::FileNode*> toRemove;
+ QList<ProjectExplorer::FileNode*> toAdd;
// The list of files for which we call updateSourceFile
QStringList toUpdate;
qSort(newFilePaths);
qSort(existingFileNodes.begin(), existingFileNodes.end(), ProjectNode::sortNodesByPath);
- QList<FileNode*>::const_iterator existingNodeIter = existingFileNodes.constBegin();
+ QList<ProjectExplorer::FileNode*>::const_iterator existingNodeIter = existingFileNodes.constBegin();
QList<QString>::const_iterator newPathIter = newFilePaths.constBegin();
while (existingNodeIter != existingFileNodes.constEnd()
&& newPathIter != newFilePaths.constEnd()) {
toRemove << *existingNodeIter;
++existingNodeIter;
} else if ((*existingNodeIter)->path() > *newPathIter) {
- toAdd << new FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
+ toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
++newPathIter;
} else { // *existingNodeIter->path() == *newPathIter
QString fileName = (*existingNodeIter)->path();
++existingNodeIter;
}
while (newPathIter != newFilePaths.constEnd()) {
- toAdd << new FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
+ toAdd << new ProjectExplorer::FileNode(*newPathIter, ProjectExplorer::HeaderType, true);
++newPathIter;
}
// Update project tree
if (!toRemove.isEmpty()) {
- foreach (FileNode *file, toRemove)
+ foreach (ProjectExplorer::FileNode *file, toRemove)
m_uitimestamps.remove(file->path());
removeFileNodes(toRemove, this);
}
CPlusPlus::CppModelManagerInterface::instance();
if (!toAdd.isEmpty()) {
- foreach (FileNode *file, toAdd) {
+ foreach (ProjectExplorer::FileNode *file, toAdd) {
m_uitimestamps.insert(file->path(), QFileInfo(file->path()).lastModified());
toUpdate << file->path();
m_projectType = InvalidProject;
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
+ foreach (ProjectExplorer::NodesWatcher *watcher, watchers())
+ if (Internal::Qt4NodesWatcher *qt4Watcher = qobject_cast<Internal::Qt4NodesWatcher*>(watcher))
emit qt4Watcher->projectTypeChanged(this, oldType, InvalidProject);
}
void Qt4ProFileNode::updateCodeModelSupportFromBuild(const QStringList &files)
{
foreach (const QString &file, files) {
- QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
end = m_uiCodeModelSupport.constEnd();
for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
if (it.value()->fileName() == file)
void Qt4ProFileNode::updateCodeModelSupportFromEditor(const QString &uiFileName,
const QString &contents)
{
- const QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it =
+ const QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it =
m_uiCodeModelSupport.constFind(uiFileName);
if (it != m_uiCodeModelSupport.constEnd())
it.value()->updateFromEditor(contents);
= CPlusPlus::CppModelManagerInterface::instance();
// First move all to
- QMap<QString, Qt4UiCodeModelSupport *> oldCodeModelSupport;
+ QMap<QString, Internal::Qt4UiCodeModelSupport *> oldCodeModelSupport;
oldCodeModelSupport = m_uiCodeModelSupport;
m_uiCodeModelSupport.clear();
// Only those two project types can have ui files for us
if (m_projectType == ApplicationTemplate || m_projectType == LibraryTemplate) {
// Find all ui files
- FindUiFileNodesVisitor uiFilesVisitor;
+ Internal::FindUiFileNodesVisitor uiFilesVisitor;
this->accept(&uiFilesVisitor);
- const QList<FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
+ const QList<ProjectExplorer::FileNode*> uiFiles = uiFilesVisitor.uiFileNodes;
// Find the UiDir, there can only ever be one
const QString uiDir = uiDirectory();
- foreach (const FileNode *uiFile, uiFiles) {
+ foreach (const ProjectExplorer::FileNode *uiFile, uiFiles) {
const QString uiHeaderFilePath = uiHeaderFile(uiDir, uiFile->path());
// qDebug()<<"code model support for "<<uiFile->path()<<" "<<uiHeaderFilePath;
- QMap<QString, Qt4UiCodeModelSupport *>::iterator it = oldCodeModelSupport.find(uiFile->path());
+ QMap<QString, Internal::Qt4UiCodeModelSupport *>::iterator it = oldCodeModelSupport.find(uiFile->path());
if (it != oldCodeModelSupport.end()) {
// qDebug()<<"updated old codemodelsupport";
- Qt4UiCodeModelSupport *cms = it.value();
+ Internal::Qt4UiCodeModelSupport *cms = it.value();
cms->setFileName(uiHeaderFilePath);
m_uiCodeModelSupport.insert(it.key(), cms);
oldCodeModelSupport.erase(it);
} else {
// qDebug()<<"adding new codemodelsupport";
- Qt4UiCodeModelSupport *cms = new Qt4UiCodeModelSupport(modelManager, m_project, uiFile->path(), uiHeaderFilePath);
+ Internal::Qt4UiCodeModelSupport *cms = new Internal::Qt4UiCodeModelSupport(modelManager, m_project, uiFile->path(), uiHeaderFilePath);
m_uiCodeModelSupport.insert(uiFile->path(), cms);
modelManager->addEditorSupport(cms);
}
}
}
// Remove old
- QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
+ QMap<QString, Internal::Qt4UiCodeModelSupport *>::const_iterator it, end;
end = oldCodeModelSupport.constEnd();
for (it = oldCodeModelSupport.constBegin(); it!=end; ++it) {
modelManager->removeEditorSupport(it.value());
}
}
-Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
- : NodesWatcher(parent)
-{
-}
-
-} // namespace Internal
} // namespace Qt4ProjectManager
namespace Qt4ProjectManager {
-// Import base classes into namespace
-using ProjectExplorer::Node;
-using ProjectExplorer::FileNode;
-using ProjectExplorer::FolderNode;
-using ProjectExplorer::ProjectNode;
-using ProjectExplorer::NodesWatcher;
-
-// Import enums into namespace
-using ProjectExplorer::NodeType;
-using ProjectExplorer::FileNodeType;
-using ProjectExplorer::FolderNodeType;
-using ProjectExplorer::ProjectNodeType;
-
-using ProjectExplorer::UnknownFileType;
-using ProjectExplorer::ProjectFileType;
-
+class Qt4ProFileNode;
class Qt4Project;
-namespace Internal {
-
-using ProjectExplorer::FileType;
-class Qt4UiCodeModelSupport;
-
// Type of projects
enum Qt4ProjectType {
InvalidProject = 0,
SymbianCapabilities
};
-class Qt4PriFileNode;
-class Qt4ProFileNode;
+namespace Internal {
-class Qt4PriFile : public Core::IFile
-{
- Q_OBJECT
-public:
- Qt4PriFile(Qt4PriFileNode *qt4PriFile);
- virtual bool save(QString *errorString, const QString &fileName, bool autoSave);
- virtual QString fileName() const;
- virtual void rename(const QString &newName);
+// Import base classes into namespace
+using ProjectExplorer::Node;
+using ProjectExplorer::FileNode;
+using ProjectExplorer::FolderNode;
+using ProjectExplorer::ProjectNode;
+using ProjectExplorer::NodesWatcher;
- virtual QString defaultPath() const;
- virtual QString suggestedFileName() const;
- virtual QString mimeType() const;
+// Import enums into namespace
+using ProjectExplorer::NodeType;
+using ProjectExplorer::FileNodeType;
+using ProjectExplorer::FolderNodeType;
+using ProjectExplorer::ProjectNodeType;
- virtual bool isModified() const;
- virtual bool isReadOnly() const;
- virtual bool isSaveAsAllowed() const;
+using ProjectExplorer::UnknownFileType;
+using ProjectExplorer::ProjectFileType;
- ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
- bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
+using ProjectExplorer::FileType;
-private:
- Qt4PriFileNode *m_priFile;
-};
+class Qt4UiCodeModelSupport;
+class ProFileReader;
+class Qt4PriFile;
// Implements ProjectNode for qt4 pro files
class Qt4PriFileNode : public ProjectExplorer::ProjectNode
QString m_projectDir;
QMap<QString, Qt4UiCodeModelSupport *> m_uiCodeModelSupport;
- Qt4PriFile *m_qt4PriFile;
+ Internal::Qt4PriFile *m_qt4PriFile;
// Memory is cheap...
// TODO (really that cheap?)
QSet<QString> m_watchedFolders;
// managed by Qt4ProFileNode
- friend class Qt4ProFileNode;
+ friend class Qt4ProjectManager::Qt4ProFileNode;
friend class Qt4PriFile; // for scheduling updates on modified
// internal temporary subtree representation
friend struct InternalNode;
};
-struct TargetInformation
+class Qt4PriFile : public Core::IFile
+{
+ Q_OBJECT
+public:
+ Qt4PriFile(Qt4PriFileNode *qt4PriFile);
+ virtual bool save(QString *errorString, const QString &fileName, bool autoSave);
+ virtual QString fileName() const;
+ virtual void rename(const QString &newName);
+
+ virtual QString defaultPath() const;
+ virtual QString suggestedFileName() const;
+ virtual QString mimeType() const;
+
+ virtual bool isModified() const;
+ virtual bool isReadOnly() const;
+ virtual bool isSaveAsAllowed() const;
+
+ ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+ bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
+
+private:
+ Qt4PriFileNode *m_priFile;
+};
+
+class Qt4NodesWatcher : public ProjectExplorer::NodesWatcher
+{
+ Q_OBJECT
+ Q_DISABLE_COPY(Qt4NodesWatcher)
+public:
+ Qt4NodesWatcher(QObject *parent = 0);
+
+signals:
+ void projectTypeChanged(Qt4ProjectManager::Qt4ProFileNode *projectNode,
+ const Qt4ProjectManager::Qt4ProjectType oldType,
+ const Qt4ProjectManager::Qt4ProjectType newType);
+
+ void variablesChanged(Qt4ProFileNode *projectNode,
+ const QHash<Qt4Variable, QStringList> &oldValues,
+ const QHash<Qt4Variable, QStringList> &newValues);
+
+ void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *projectNode, bool success);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *projectNode);
+
+private:
+ // let them emit signals
+ friend class Qt4ProjectManager::Qt4ProFileNode;
+ friend class Qt4PriFileNode;
+};
+
+} // namespace Internal
+
+struct QT4PROJECTMANAGER_EXPORT TargetInformation
{
bool valid;
QString workingDir;
};
-struct InstallsItem {
+struct QT4PROJECTMANAGER_EXPORT InstallsItem {
InstallsItem(QString p, QStringList f) : path(p), files(f) {}
QString path;
QStringList files;
};
-struct InstallsList {
+struct QT4PROJECTMANAGER_EXPORT InstallsList {
void clear() { targetPath.clear(); items.clear(); }
QString targetPath;
QList<InstallsItem> items;
};
-struct ProjectVersion {
+struct QT4PROJECTMANAGER_EXPORT ProjectVersion {
int major;
int minor;
int patch;
};
// Implements ProjectNode for qt4 pro files
-class Qt4ProFileNode : public Qt4PriFileNode
+class QT4PROJECTMANAGER_EXPORT Qt4ProFileNode : public Internal::Qt4PriFileNode
{
Q_OBJECT
Q_DISABLE_COPY(Qt4ProFileNode)
QtSupport::ProFileReader *m_readerCumulative;
};
-class Qt4NodesWatcher : public ProjectExplorer::NodesWatcher
-{
- Q_OBJECT
- Q_DISABLE_COPY(Qt4NodesWatcher)
-public:
- Qt4NodesWatcher(QObject *parent = 0);
-
-signals:
- void projectTypeChanged(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode,
- const Qt4ProjectManager::Internal::Qt4ProjectType oldType,
- const Qt4ProjectManager::Internal::Qt4ProjectType newType);
-
- void variablesChanged(Qt4ProFileNode *projectNode,
- const QHash<Qt4Variable, QStringList> &oldValues,
- const QHash<Qt4Variable, QStringList> &newValues);
-
- void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode, bool success);
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode);
-
-private:
- // let them emit signals
- friend class Qt4ProFileNode;
- friend class Qt4PriFileNode;
-};
-
-} // namespace Internal
} // namespace Qt4ProjectManager
#endif // QT4NODES_H
foreach (Target *t, targets())
onAddedTarget(t);
- connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *,bool)));
+ connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+ this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *,bool)));
- connect(m_nodesWatcher, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- this, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+ connect(m_nodesWatcher, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)),
+ this, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
// Now we emit update once :)
m_rootProjectNode->emitProFileUpdated();
// Add the node
m_asyncUpdateState = AsyncPartialUpdatePending;
- QList<Internal::Qt4ProFileNode *>::iterator it;
+ QList<Qt4ProFileNode *>::iterator it;
bool add = true;
if (debug)
qDebug()<<"scheduleAsyncUpdate();"<<m_partialEvaluate.size()<<"nodes";
void Qt4Project::collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
{
- if (node->projectType() == Internal::ApplicationTemplate
- || node->projectType() == Internal::ScriptTemplate) {
+ if (node->projectType() == ApplicationTemplate
+ || node->projectType() == ScriptTemplate) {
list.append(node);
}
foreach (ProjectNode *n, node->subProjectNodes()) {
}
namespace Qt4ProjectManager {
+class Qt4ProFileNode;
namespace Internal {
class DeployHelperRunStep;
class FileItem;
- class Qt4ProFileNode;
class Qt4PriFileNode;
class GCCPreprocessor;
struct Qt4ProjectFiles;
QList<Core::IFile *> dependencies(); //NBS remove
QList<ProjectExplorer::Project *>dependsOn();
- Internal::Qt4ProFileNode *rootProjectNode() const;
+ Qt4ProFileNode *rootProjectNode() const;
bool validParse(const QString &proFilePath) const;
virtual QStringList files(FilesMode fileMode) const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
- QList<Internal::Qt4ProFileNode *> allProFiles() const;
- QList<Internal::Qt4ProFileNode *> applicationProFiles() const;
+ QList<Qt4ProFileNode *> allProFiles() const;
+ QList<Qt4ProFileNode *> applicationProFiles() const;
bool hasApplicationProFile(const QString &path) const;
QStringList applicationProFilePathes(const QString &prepend = QString()) const;
void notifyChanged(const QString &name);
/// \internal
- QtSupport::ProFileReader *createProFileReader(Internal::Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
+ QtSupport::ProFileReader *createProFileReader(Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc = 0);
/// \internal
void destroyProFileReader(QtSupport::ProFileReader *reader);
/// \internal
- void scheduleAsyncUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
+ void scheduleAsyncUpdate(Qt4ProjectManager::Qt4ProFileNode *node);
/// \internal
void incrementPendingEvaluateFutures();
/// \internal
void updateFileList();
signals:
- void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *node, bool);
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
+ void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *node);
void buildDirectoryInitialized();
void fromMapFinished();
void updateQmlJSCodeModel();
- static void collectAllfProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
- static void collectApplicationProFiles(QList<Internal::Qt4ProFileNode *> &list, Internal::Qt4ProFileNode *node);
- static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
+ static void collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node);
+ static void collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node);
+ static void findProFile(const QString& fileName, Qt4ProFileNode *root, QList<Qt4ProFileNode *> &list);
static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);
static bool equalFileList(const QStringList &a, const QStringList &b);
static QString qmakeVarName(ProjectExplorer::FileType type);
Qt4Manager *m_manager;
- Internal::Qt4ProFileNode *m_rootProjectNode;
+ Qt4ProFileNode *m_rootProjectNode;
Internal::Qt4NodesWatcher *m_nodesWatcher;
Qt4ProjectFile *m_fileInfo;
enum AsyncUpdateState { NoState, Base, AsyncFullUpdatePending, AsyncPartialUpdatePending, AsyncUpdateInProgress, ShuttingDown };
AsyncUpdateState m_asyncUpdateState;
bool m_cancelEvaluate;
- QList<Internal::Qt4ProFileNode *> m_partialEvaluate;
+ QList<Qt4ProFileNode *> m_partialEvaluate;
QFuture<void> m_codeModelFuture;
wizards/wizards.qrc
include(qt-s60/qt-s60.pri)
-include(qt-maemo/qt-maemo.pri)
include(qt-desktop/qt-desktop.pri)
include(customwidgetwizard/customwidgetwizard.pri)
include(../../plugins/qtsupport/qtsupport.pri)
include(../../plugins/cpptools/cpptools.pri)
include(../../plugins/debugger/debugger.pri)
-include(../../plugins/analyzerbase/analyzerbase.pri)
include(../../libs/symbianutils/symbianutils.pri)
include(../../libs/qmljs/qmljs.pri)
#include "gettingstartedwelcomepage.h"
#include "profilecompletionassist.h"
-#include "qt-maemo/maemomanager.h"
#include "qt-s60/s60manager.h"
#include "qt-desktop/qt4desktoptargetfactory.h"
#include "qt-desktop/qt4simulatortargetfactory.h"
addAutoReleasedObject(new LinguistExternalEditor);
addAutoReleasedObject(new S60Manager);
- addAutoReleasedObject(new MaemoManager);
addAutoReleasedObject(new Qt4DesktopTargetFactory);
addAutoReleasedObject(new Qt4SimulatorTargetFactory);
#include <utils/pathchooser.h>
#include <utils/detailswidget.h>
+#include <QtCore/QCoreApplication>
#include <QtGui/QPushButton>
#include <QtGui/QMessageBox>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
#include <QtGui/QMainWindow>
+#include <QtGui/QVBoxLayout>
#include <algorithm>
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BaseTargetFactory;
-
-namespace Internal {
class Qt4ProFileNode;
-}
class QT4PROJECTMANAGER_EXPORT Qt4BaseTarget : public ProjectExplorer::Target
{
--- /dev/null
+<plugin name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+ <vendor>Nokia Corporation</vendor>
+ <copyright>(C) 2011 Nokia Corporation</copyright>
+ <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ </license>
+ <description>Support for deployment to and execution on a remote Linux host.</description>
+ <category>Device Support</category>
+ <url>http://qt.nokia.com</url>
+ <dependencyList>
+ <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"Debugger\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+ <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
+ </dependencyList>
+</plugin>
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
namespace ProjectExplorer { class DeployConfiguration; }
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class Qt4MaemoDeployConfiguration;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // ABSTRACTLINUXDEVICEDEPLOYSTEP_H
#include <projectexplorer/projectexplorerconstants.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/ssh/sshconnectionmanager.h>
using namespace Core;
using namespace Utils;
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "abstractmaemodeploystep.moc"
class QEventLoop;
QT_END_NAMESPACE
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
namespace Utils { class SshConnection; }
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageCreationStep;
class MaemoDeviceConfig;
virtual const AbstractMaemoPackageCreationStep *packagingStep() const=0;
QString deployMountPoint() const;
- const Qt4BuildConfiguration *qt4BuildConfiguration() const;
+ const Qt4ProjectManager::Qt4BuildConfiguration *qt4BuildConfiguration() const;
QSharedPointer<Utils::SshConnection> connection() const { return m_connection; }
private slots:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // ABSTRACTMAEMODEPLOYSTEP_H
using namespace Analyzer;
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
RunControl *MaemoAnalyzerSupport::createAnalyzerRunControl(MaemoRunConfiguration *runConfig)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemorunconfiguration.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace MaemoAnalyzerSupport {
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOANALYZERSUPPORT_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoConfigTestDialog::MaemoConfigTestDialog(const MaemoDeviceConfig::ConstPtr &config,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
} // namespace Utils
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOCONFIGTESTDIALOG_H
#include <QtCore/QLatin1String>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
#define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
const char * const MAEMO_SETTINGS_CATEGORY_ICON = ":/projectexplorer/images/MaemoDevice.png";
}
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOCONSTANTS_H
using namespace Debugger;
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runConfig)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
namespace ProjectExplorer { class RunControl; }
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEBUGSUPPORT_H
#include <QtCore/QHash>
#include <QtCore/QString>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployable
return qHash(qMakePair(d.localFilePath, d.remoteDir));
}
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMODEPLOYABLE_H
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4target.h>
#include <qtsupport/baseqtversion.h>
#include <QtGui/QImageReader>
#include <QtGui/QMainWindow>
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
namespace Internal {
MaemoDeployableListModel::MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
.arg(MaemoGlobal::applicationIconSize(MaemoGlobal::version(qv->qmakeCommand())));
}
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
class BaseQtVersion;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployableListModel : public QAbstractTableModel
UpdateProFile, DontUpdateProFile, AskToUpdateProFile
};
- MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
+ MaemoDeployableListModel(const Qt4ProjectManager::Qt4ProFileNode *proFileNode,
ProFileUpdateSetting updateSetting, QObject *parent);
~MaemoDeployableListModel();
QString projectName() const { return m_projectName; }
QString projectDir() const;
QString proFilePath() const { return m_proFilePath; }
- Qt4ProjectType projectType() const { return m_projectType; }
- bool isApplicationProject() const { return m_projectType == ApplicationTemplate; }
+ Qt4ProjectManager::Qt4ProjectType projectType() const { return m_projectType; }
+ bool isApplicationProject() const { return m_projectType == Qt4ProjectManager::ApplicationTemplate; }
QString applicationName() const { return m_targetInfo.target; }
bool hasTargetPath() const { return m_hasTargetPath; }
bool canAddDesktopFile() const { return isApplicationProject() && !hasDesktopFile(); }
QString remoteIconDir() const;
QStringList localLibraryFilePaths() const;
- const Qt4ProjectType m_projectType;
+ const Qt4ProjectManager::Qt4ProjectType m_projectType;
const QString m_proFilePath;
const QString m_projectName;
- const TargetInformation m_targetInfo;
- const InstallsList m_installsList;
- const ProjectVersion m_projectVersion;
+ const Qt4ProjectManager::TargetInformation m_targetInfo;
+ const Qt4ProjectManager::InstallsList m_installsList;
+ const Qt4ProjectManager::ProjectVersion m_projectVersion;
const QStringList m_config;
QList<MaemoDeployable> m_deployables;
mutable bool m_modified;
bool m_hasTargetPath;
};
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMOPACKAGECONTENTS_H
#include <proparser/profileevaluator.h>
#include <projectexplorer/buildstep.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4target.h>
#include <QtCore/QTimer>
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
namespace Internal {
MaemoDeployables::MaemoDeployables(const Qt4BaseTarget *target)
void MaemoDeployables::init()
{
Qt4Project * const pro = m_target->qt4Project();
- connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+ connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
m_updateTimer, SLOT(start()));
// TODO do we want to disable the view
return;
m_updateTimer->stop();
disconnect(m_target->qt4Project(),
- SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+ SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
m_updateTimer, SLOT(start()));
beginResetModel();
qDeleteAll(m_listModels);
endResetModel();
connect(m_target->qt4Project(),
- SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
+ SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
m_updateTimer, SLOT(start()));
}
return QVariant();
}
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
class Qt4BaseTarget;
+class Qt4ProFileNode;
+} // namespace Qt4ProjectManager
+namespace RemoteLinux {
namespace Internal {
-class Qt4ProFileNode;
class MaemoDeployables : public QAbstractListModel
{
Q_OBJECT
public:
- MaemoDeployables(const Qt4BaseTarget *target);
+ MaemoDeployables(const Qt4ProjectManager::Qt4BaseTarget *target);
~MaemoDeployables();
void setUnmodified();
bool isModified() const;
Q_SLOT void createModels();
Q_SLOT void init();
- void createModels(const Qt4ProFileNode *proFileNode);
+ void createModels(const Qt4ProjectManager::Qt4ProFileNode *proFileNode);
QList<MaemoDeployableListModel *> m_listModels;
UpdateSettingsMap m_updateSettings;
- const Qt4BaseTarget * const m_target;
+ const Qt4ProjectManager::Qt4BaseTarget * const m_target;
QTimer *const m_updateTimer;
};
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMODEPLOYABLES_H
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(ExtendedState, state, m_extendedState)
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
AbstractMaemoDeployByMountStep::AbstractMaemoDeployByMountStep(BuildStepList *parent,
= tr("Deploy files via UTFS mount");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemodeployable.h"
#include "maemomountspecification.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageInstaller;
class MaemoDeploymentMounter;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYBYMOUNTSTEP_H
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class Qt4MaemoDeployConfiguration;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYCONFIGURATIONWIDGET_H
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
+using namespace Qt4ProjectManager;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoDeploymentMounter::MaemoDeploymentMounter(QObject *parent)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QSharedPointer>
namespace Utils { class SshConnection; }
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoRemoteMounter;
void setupMounts(const QSharedPointer<Utils::SshConnection> &connection,
const QSharedPointer<const MaemoDeviceConfig> &devConf,
const QList<MaemoMountSpecification> &mountSpecs,
- const Qt4BuildConfiguration *bc);
+ const Qt4ProjectManager::Qt4BuildConfiguration *bc);
void tearDownMounts();
signals:
MaemoUsedPortsGatherer * const m_portsGatherer;
MaemoPortList m_freePorts;
QList<MaemoMountSpecification> m_mountSpecs;
- const Qt4BuildConfiguration *m_buildConfig;
+ const Qt4ProjectManager::Qt4BuildConfiguration *m_buildConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYMENTMOUNTER_H
class SshConnection;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
class Qt4BuildConfiguration;
namespace Internal {
class AbstractMaemoPackageCreationStep;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEP_H
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <QtCore/QCoreApplication>
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QString OldMaemoDeployStepId(QLatin1String("Qt4ProjectManager.MaemoDeployStep"));
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <projectexplorer/buildstep.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployStepFactory : public ProjectExplorer::IBuildStepFactory
{
public:
- MaemoDeployStepFactory(QObject *parent);
+ MaemoDeployStepFactory(QObject *parent = 0);
virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
virtual QString displayNameForId(const QString &id) const;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEPFACTORY_H
#include "maemodeviceconfigurations.h"
#include "maemosettingspages.h"
#include "maemoglobal.h"
-#include "maemomanager.h"
#include "maemopertargetdeviceconfigurationlistmodel.h"
#include "maemorunconfiguration.h"
#include "qt4maemodeployconfiguration.h"
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoDeployStepBaseWidget::MaemoDeployStepBaseWidget(AbstractLinuxDeviceDeployStep *step) :
void MaemoDeployStepBaseWidget::showDeviceConfigurations()
{
- MaemoDeviceConfigurationsSettingsPage *page
- = MaemoManager::instance().deviceConfigurationsSettingsPage();
- Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
+ Core::ICore::instance()->showOptionsDialog(MaemoDeviceConfigurationsSettingsPage::Category,
+ MaemoDeviceConfigurationsSettingsPage::Id);
}
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractLinuxDeviceDeployStep;
class AbstractMaemoDeployStep;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEPWIDGET_H
typedef Utils::SshConnectionParameters::AuthenticationType AuthType;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
MaemoDeviceConfigurations *MaemoDeviceConfigurations::m_instance = 0;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class QSettings;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPortList
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGURATIONS_H
using namespace Core;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QLatin1String LastDeviceConfigIndexKey("LastDisplayedMaemoDeviceConfig");
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class NameValidator;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemodeviceconfigwizard.moc"
#include <QtCore/QScopedPointer>
#include <QtGui/QWizard>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoDeviceConfigurations;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGWIZARD_H
#include <utils/ssh/sshremoteprocessrunner.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, MaemoRunConfiguration *config)
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
using namespace ProjectExplorer;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoDirectDeviceUploadStep::MaemoDirectDeviceUploadStep(BuildStepList *parent)
= tr("Upload files via SFTP");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SftpChannel;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployable;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODIRECTDEVICEUPLOADSTEP_H
#include <QtCore/QString>
#include <QtGui/QDesktopServices>
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Constants;
+
+namespace RemoteLinux {
namespace Internal {
namespace {
static const QLatin1String binQmake("/bin/qmake" EXEC_SUFFIX);
bool MaemoGlobal::isFremantleTargetId(const QString &id)
{
- return id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID);
+ return id == QLatin1String(MAEMO5_DEVICE_TARGET_ID);
}
bool MaemoGlobal::isHarmattanTargetId(const QString &id)
{
- return id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID);
+ return id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID);
}
bool MaemoGlobal::isMeegoTargetId(const QString &id)
{
- return id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID);
+ return id == QLatin1String(MEEGO_DEVICE_TARGET_ID);
}
bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class QString;
QT_END_NAMESPACE
+namespace QtSupport { class BaseQtVersion; }
namespace Utils { class SshConnection; }
-namespace QtSupport {
-class BaseQtVersion;
-}
-namespace Qt4ProjectManager {
+
+namespace RemoteLinux {
namespace Internal {
class WatchableFile : public Core::IFile
class MaemoGlobal
{
- Q_DECLARE_TR_FUNCTIONS(Qt4ProjectManager::Internal::MaemoGlobal)
+ Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::MaemoGlobal)
public:
enum PackagingSystem { Dpkg, Rpm, Tar };
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOGLOBAL_H
#include <QtCore/QWeakPointer>
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoInstallPackageToSysrootWidget : public BuildStepConfigWidget
= tr("Copy files to sysroot");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemoinstalltosysrootstep.moc"
QT_FORWARD_DECLARE_CLASS(QProcess)
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoInstallPackageToSysrootStep : public ProjectExplorer::BuildStep
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOINSTALLTOSYSROOTSTEP_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoKeyDeployer::MaemoKeyDeployer(QObject *parent)
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoKeyDeployer : public QObject
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOKEYDEPLOYER_H
#include "maemomountspecification.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
const QLatin1String MaemoMountSpecification::InvalidMountPoint("/");
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QLatin1String>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
struct MaemoMountSpecification {
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOMOUNTSPECIFICATION_H
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
-#include <qt4projectmanagerconstants.h>
#include <QtCore/QCoreApplication>
using ProjectExplorer::BuildStepList;
using ProjectExplorer::BuildStep;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QString OldCreatePackageId("Qt4ProjectManager.MaemoPackageCreationStep");
QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const
{
if (id == MaemoDebianPackageCreationStep::CreatePackageId) {
- return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+ return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
"Create Debian Package");
} else if (id == MaemoRpmPackageCreationStep::CreatePackageId) {
- return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+ return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
"Create RPM Package");
} else if (id == MaemoTarPackageCreationStep::CreatePackageId) {
- return QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoPackageCreationFactory",
+ return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
"Create tarball");
}
return QString();
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <projectexplorer/buildstep.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
{
public:
- MaemoPackageCreationFactory(QObject *parent);
+ MaemoPackageCreationFactory(QObject *parent = 0);
virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
virtual QString displayNameForId(const QString &id) const;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONFACTORY_H
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h>
-#include <qt4buildconfiguration.h>
-#include <qt4project.h>
-#include <qt4target.h>
+#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qt4target.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
using ProjectExplorer::BuildStepList;
using ProjectExplorer::BuildStepConfigWidget;
using ProjectExplorer::Task;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
const QLatin1String AbstractMaemoPackageCreationStep::DefaultVersionNumber("0.0.1");
= QLatin1String("MaemoTarPackageCreationStep");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemopackagecreationstep.moc"
class QProcess;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployableListModel;
class AbstractQt4MaemoTarget;
bool setVersionString(const QString &version, QString *error);
static void preparePackagingProcess(QProcess *proc,
- const Qt4BuildConfiguration *bc, const QString &workingDir);
+ const Qt4ProjectManager::Qt4BuildConfiguration *bc,
+ const QString &workingDir);
QString projectName() const;
- const Qt4BuildConfiguration *qt4BuildConfiguration() const;
+ const Qt4ProjectManager::Qt4BuildConfiguration *qt4BuildConfiguration() const;
AbstractQt4MaemoTarget *maemoTarget() const;
AbstractDebBasedQt4MaemoTarget *debBasedMaemoTarget() const;
AbstractRpmBasedQt4MaemoTarget *rpmBasedMaemoTarget() const;
static QString nativePath(const QFile &file);
bool packagingNeeded() const;
- const Qt4BuildConfiguration *m_lastBuildConfig;
+ const Qt4ProjectManager::Qt4BuildConfiguration *m_lastBuildConfig;
};
virtual bool isMetaDataNewerThan(const QDateTime &packageDate) const;
void ctor();
- static QString packagingCommand(const Qt4BuildConfiguration *bc,
+ static QString packagingCommand(const Qt4ProjectManager::Qt4BuildConfiguration *bc,
const QString &commandName);
bool copyDebianFiles(bool inSourceBuild);
void checkProjectName();
MaemoRpmPackageCreationStep *other);
void ctor();
- static QString rpmBuildDir(const Qt4BuildConfiguration *bc);
+ static QString rpmBuildDir(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
static const QString CreatePackageId;
};
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONSTEP_H
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
// TODO: Split up into dedicated widgets for Debian and RPM steps.
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
namespace Ui { class MaemoPackageCreationWidget; }
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageCreationStep;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONWIDGET_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
AbstractMaemoPackageInstaller::AbstractMaemoPackageInstaller(QObject *parent)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QString>
#include <QtCore/QStringList>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // ABSTRACTMAEMOPACKAGEINSTALLER_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPackageUploader::MaemoPackageUploader(QObject *parent) :
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshConnection;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPackageUploader : public QObject
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPACKAGEUPLOADER_H
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPerTargetDeviceConfigurationListModel::MaemoPerTargetDeviceConfigurationListModel(QObject *parent,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
namespace ProjectExplorer { class Target; }
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPerTargetDeviceConfigurationListModel : public QAbstractListModel
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H
#include <QtCore/QDir>
#include <QtGui/QTableWidgetItem>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoProFilesUpdateDialog::MaemoProFilesUpdateDialog(const QList<MaemoDeployableListModel *> &models,
return settings;
}
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeployableListModel;
Ui::MaemoProFilesUpdateDialog *ui;
};
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMOPROFILESUPDATEDIALOG_H
#include <QtCore/QFileInfo>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const int IncludeColumn = 2;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QStringList>
#include <QtGui/QFileSystemModel>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublishedProjectModel : public QFileSystemModel
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHEDPROJECTMODEL_H
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
using namespace Core;
+using namespace Qt4ProjectManager;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPublisherFremantleFree::MaemoPublisherFremantleFree(const ProjectExplorer::Project *project,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
+}
+
+namespace RemoteLinux {
namespace Internal {
class MaemoPublisherFremantleFree : public QObject
void publish();
void cancel();
- void setBuildConfiguration(const Qt4BuildConfiguration *buildConfig) { m_buildConfig = buildConfig; }
+ void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *buildConfig) { m_buildConfig = buildConfig; }
void setDoUpload(bool doUpload) { m_doUpload = doUpload; }
void setSshParams(const QString &hostName, const QString &userName,
const QString &keyFile, const QString &remoteDir);
const ProjectExplorer::Project * const m_project;
bool m_doUpload;
- const Qt4BuildConfiguration *m_buildConfig;
+ const Qt4ProjectManager::Qt4BuildConfiguration *m_buildConfig;
State m_state;
QString m_tmpProjectDir;
QProcess *m_process;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHERFREMANTLEFREE_H
#include <utils/qtcassert.h>
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPublishingBuildSettingsPageFremantleFree::MaemoPublishingBuildSettingsPageFremantleFree(const Project *project,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
QT_END_NAMESPACE
namespace ProjectExplorer { class Project; }
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
-
+namespace RemoteLinux {
namespace Internal {
class MaemoPublisherFremantleFree;
void collectBuildConfigurations(const ProjectExplorer::Project *project);
bool skipUpload() const;
- QList<Qt4BuildConfiguration *> m_buildConfigs;
+ QList<Qt4ProjectManager::Qt4BuildConfiguration *> m_buildConfigs;
MaemoPublisherFremantleFree * const m_publisher;
Ui::MaemoPublishingWizardPageFremantleFree *ui;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
#include "maemopublishedprojectmodel.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPublishingFileSelectionDialog::MaemoPublishingFileSelectionDialog(const QString &projectPath,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublishingFileSelectionDialog : public QDialog
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGFILESELECTIONDIALOG_H
#include <QtGui/QAbstractButton>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
typedef MaemoPublisherFremantleFree MPFF;
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublishingResultPageFremantleFree : public QWizardPage
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
#include <QtCore/QDir>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPublishingUploadSettingsPageFremantleFree::MaemoPublishingUploadSettingsPageFremantleFree(MaemoPublisherFremantleFree *publisher,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublisherFremantleFree;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
#include <qtsupport/baseqtversion.h>
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoPublishingWizardFactoryFremantleFree::MaemoPublishingWizardFactoryFremantleFree(QObject *parent)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublishingWizardFactoryFremantleFree
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGSERVICE_H
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
enum PageId { BuildSettingsPageId, UploadSettingsPageId, ResultPageId };
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class Project;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPublishingResultPageFremantleFree;
class MaemoPublisherFremantleFree;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H
#include "maemoqemumanager.h"
#include "maemoglobal.h"
-#include "maemomanager.h"
#include "maemoqemuruntimeparser.h"
#include "maemosettingspages.h"
#include "maemorunconfiguration.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
#include "qt4maemotarget.h"
#include "maemoqtversion.h"
#include <coreplugin/modemanager.h>
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/project.h>
#include <projectexplorer/session.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/filesystemwatcher.h>
using namespace ProjectExplorer;
using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace RemoteLinux;
+using namespace RemoteLinux::Internal;
MaemoQemuManager *MaemoQemuManager::m_instance = 0;
tr("Qemu failed to start: %1"));
break;
case QemuCrashed:
- MaemoManager::instance().qemuSettingsPage()->showQemuCrashDialog();
+ MaemoQemuSettingsPage::showQemuCrashDialog();
break;
case QemuFinished:
case QemuUserReason:
namespace QtSupport {
class BaseQtVersion;
}
-namespace Qt4ProjectManager {
- namespace Internal {
- class MaemoRunConfiguration;
+namespace RemoteLinux {
+namespace Internal {
+class MaemoRunConfiguration;
class MaemoQemuManager : public QObject
{
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // QEMURUNTIMEMANAGER_H
#include <QtCore/QProcessEnvironment>
#include <QtCore/QString>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
enum QemuStatus {
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOQEMURUNTIME_H
#include <QtCore/QStringList>
#include <QtCore/QTextStream>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQemuRuntimeParserV1 : public MaemoQemuRuntimeParser
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class BaseQtVersion;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQemuRuntimeParser
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOQEMURUNTIMEPARSER_H
#include <QtCore/QSettings>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QString SettingsGroup = QLatin1String("Maemo Qemu Settings");
MaemoQemuSettings::OpenGlMode MaemoQemuSettings::m_openGlMode;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#ifndef MAEMOQEMUSETTINGS_H
#define MAEMOQEMUSETTINGS_H
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQemuSettings
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOQEMUSETTINGS_H
#include "maemoqemusettings.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoQemuSettingsWidget::MaemoQemuSettingsWidget(QWidget *parent) :
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
}
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQemuSettingsWidget : public QWidget
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOQEMUSETTINGSWIDGET_H
**
**************************************************************************/
+#include "maemoglobal.h"
#include "maemoqtversion.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt-maemo/maemoglobal.h"
+
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/qtsupportconstants.h>
#include <QtCore/QDir>
using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
-MaemoQtVersion::MaemoQtVersion()
- : QtSupport::BaseQtVersion()
+namespace RemoteLinux {
+namespace Internal {
+
+MaemoQtVersion::MaemoQtVersion() : QtSupport::BaseQtVersion()
{
}
{
return m_osVersion;
}
+
+} // namespace Internal
+} // namespace RemoteLinux
#include "maemodeviceconfigurations.h"
#include <qtsupport/baseqtversion.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQtVersion : public QtSupport::BaseQtVersion
mutable bool m_isvalidVersion;
};
-}
-}
-
+} // namespace Internal
+} // namespace RemoteLinux
#endif // MAEMOQTVERSION_H
#include "maemoqtversionfactory.h"
#include "maemoglobal.h"
-#include "qt4projectmanagerconstants.h"
#include "maemoqtversion.h"
#include <qtsupport/qtsupportconstants.h>
#include <QtCore/QFileInfo>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+namespace RemoteLinux {
+namespace Internal {
MaemoQtVersionFactory::MaemoQtVersionFactory(QObject *parent)
: QtSupport::QtVersionFactory(parent)
return new MaemoQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
return 0;
}
+
+} // Internal
+} // Qt4ProjectManager
#include <qtsupport/qtversionfactory.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoQtVersionFactory : public QtSupport::QtVersionFactory
} // Internal
} // Qt4ProjectManager
-
#endif // MAEMOQTVERSIONFACTORY_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoRemoteCopyFacility::MaemoRemoteCopyFacility(QObject *parent) :
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOREMOTECOPYFACILITY_H
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
+using namespace Qt4ProjectManager;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcess;
}
-namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
+namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
+
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoUsedPortsGatherer;
void setConnection(const QSharedPointer<Utils::SshConnection> &connection,
const QSharedPointer<const MaemoDeviceConfig> &devConf);
- void setBuildConfiguration(const Qt4BuildConfiguration *bc);
+ void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
void addMountSpecification(const MaemoMountSpecification &mountSpec,
bool mountAsRoot);
bool hasValidMountSpecifications() const;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOREMOTEMOUNTER_H
#include "maemoconstants.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoRemoteMountsModel::MaemoRemoteMountsModel(QObject *parent) :
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QString>
#include <QtCore/QVariantMap>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoRemoteMountsModel : public QAbstractTableModel
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOREMOTEMOUNTSMODEL_H
#include <QtGui/QMessageBox>
#include <QtGui/QSortFilterProxyModel>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoRemoteProcessesDialog::MaemoRemoteProcessesDialog(const MaemoDeviceConfig::ConstPtr &devConfig,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class QSortFilterProxyModel;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoRemoteProcessList;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOREMOTEPROCESSDIALOG_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QByteArray LineSeparator1("---");
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QString>
#include <utils/ssh/sshremoteprocessrunner.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOREMOTEPROCESSLIST_H
#include <qtsupport/qtoutputformatter.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
+#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4target.h>
#include <QtCore/QStringBuilder>
-namespace Qt4ProjectManager {
+using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
namespace Internal {
namespace {
const bool DefaultUseRemoteGdbValue = false;
} // anonymous namespace
-using namespace ProjectExplorer;
-
MaemoRunConfiguration::MaemoRunConfiguration(Qt4BaseTarget *parent,
const QString &proFilePath)
: RunConfiguration(parent, QLatin1String(MAEMO_RC_ID))
handleDeployConfigChanged();
Qt4Project *pro = qt4Target()->qt4Project();
- connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
- connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
+ connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
+ this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool)));
+ connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *)),
+ this, SLOT(proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode*)));
}
MaemoRunConfiguration::~MaemoRunConfiguration()
}
}
-void MaemoRunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
+void MaemoRunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
{
if (m_proFilePath != pro->path())
return;
handleParseState(false);
}
-void MaemoRunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
+void MaemoRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success)
{
if (m_proFilePath == pro->path()) {
handleParseState(success);
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
QT_FORWARD_DECLARE_CLASS(QWidget)
namespace Qt4ProjectManager {
-
class Qt4BuildConfiguration;
class Qt4Project;
class Qt4BaseTarget;
+class Qt4ProFileNode;
+} // namespace Qt4ProjectManager
+namespace RemoteLinux {
namespace Internal {
-class Qt4ProFileNode;
-
class AbstractLinuxDeviceDeployStep;
class MaemoDeviceConfigListModel;
-class MaemoManager;
class MaemoRemoteMountsModel;
class MaemoRunConfigurationFactory;
class MaemoToolChain;
enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
- MaemoRunConfiguration(Qt4BaseTarget *parent, const QString &proFilePath);
+ MaemoRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent,
+ const QString &proFilePath);
virtual ~MaemoRunConfiguration();
using ProjectExplorer::RunConfiguration::isEnabled;
bool isEnabled(ProjectExplorer::BuildConfiguration *config) const;
QWidget *createConfigurationWidget();
Utils::OutputFormatter *createOutputFormatter() const;
- Qt4BaseTarget *qt4Target() const;
- Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
+ Qt4ProjectManager::Qt4BaseTarget *qt4Target() const;
+ Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
Qt4MaemoDeployConfiguration *deployConfig() const;
MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; }
void userEnvironmentChangesChanged(const QList<Utils::EnvironmentItem> &diff);
protected:
- MaemoRunConfiguration(Qt4BaseTarget *parent, MaemoRunConfiguration *source);
+ MaemoRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent,
+ MaemoRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map);
QString defaultDisplayName();
private slots:
- void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
- void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
+ void proFileUpdate(Qt4ProjectManager::Qt4ProFileNode *pro, bool success);
+ void proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro);
void updateDeviceConfigurations();
void handleDeployConfigChanged();
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMORUNCONFIGURATION_H
#include "maemodeployables.h"
#include "maemodeviceenvreader.h"
-#include "maemomanager.h"
#include "maemoglobal.h"
#include "maemoremotemountsmodel.h"
#include "maemorunconfiguration.h"
#include <QtGui/QTableView>
#include <QtGui/QToolButton>
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
namespace Internal {
namespace {
const QString FetchEnvButtonText
- = QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoRunConfigurationWidget",
+ = QCoreApplication::translate("ReoteLinux::Internal::MaemoRunConfigurationWidget",
"Fetch Device Environment");
} // anonymous namespace
void MaemoRunConfigurationWidget::showDeviceConfigurationsDialog(const QString &link)
{
if (link == QLatin1String("deviceconfig")) {
- MaemoDeviceConfigurationsSettingsPage *page
- = MaemoManager::instance().deviceConfigurationsSettingsPage();
- Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
+ Core::ICore::instance()->showOptionsDialog(MaemoDeviceConfigurationsSettingsPage::Category,
+ MaemoDeviceConfigurationsSettingsPage::Id);
} else if (link == QLatin1String("debugger")) {
Core::ICore::instance()->showOptionsDialog(QLatin1String("O.Debugger"),
QLatin1String("M.Gdb"));
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
QT_END_NAMESPACE
namespace Utils {
+class DetailsWidget;
class EnvironmentItem;
}
class EnvironmentWidget;
}
-namespace Utils { class DetailsWidget; }
-
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
+}
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceEnvReader;
class MaemoRunConfiguration;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMORUNCONFIGURATIONWIDGET_H
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
using ProjectExplorer::RunConfiguration;
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QString>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoRunConfiguration;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMORUNCONTROL_H
#include <projectexplorer/projectexplorerconstants.h>
#include <debugger/debuggerconstants.h>
#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <analyzerbase/analyzerconstants.h>
-namespace Qt4ProjectManager {
-namespace Internal {
-
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
+namespace Internal {
namespace {
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
using ProjectExplorer::RunControl;
using ProjectExplorer::Target;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoRunConfigurationFactory : public IRunConfigurationFactory
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMORUNFACTORIES_H
#include <QtGui/QLabel>
#include <QtGui/QVBoxLayout>
#include <QtGui/QIcon>
+#include <QtGui/QMainWindow>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
+namespace {
+class MaemoQemuCrashDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ MaemoQemuCrashDialog(QWidget *parent = 0) : QDialog(parent)
+ {
+ setWindowTitle(tr("Qemu error"));
+ QString message = tr("Qemu crashed.") + QLatin1String(" <p>");
+ const MaemoQemuSettings::OpenGlMode openGlMode
+ = MaemoQemuSettings::openGlMode();
+ const QString linkString = QLatin1String("</p><a href=\"dummy\">")
+ + tr("Click here to change the OpenGL mode.")
+ + QLatin1String("</a>");
+ if (openGlMode == MaemoQemuSettings::HardwareAcceleration) {
+ message += tr("You have configured Qemu to use OpenGL "
+ "hardware acceleration, which might not be supported by "
+ "your system. You could try using software rendering instead.");
+ message += linkString;
+ } else if (openGlMode == MaemoQemuSettings::AutoDetect) {
+ message += tr("Qemu is currently configured to auto-detect the "
+ "OpenGL mode, which is known to not work in some cases. "
+ "You might want to use software rendering instead.");
+ message += linkString;
+ }
+ QLabel * const messageLabel = new QLabel(message, this);
+ messageLabel->setWordWrap(true);
+ messageLabel->setTextFormat(Qt::RichText);
+ connect(messageLabel, SIGNAL(linkActivated(QString)),
+ SLOT(showSettingsPage()));
+ QVBoxLayout *mainLayout = new QVBoxLayout(this);
+ mainLayout->addWidget(messageLabel);
+ QFrame * const separator = new QFrame;
+ separator->setFrameShape(QFrame::HLine);
+ separator->setFrameShadow(QFrame::Sunken);
+ mainLayout->addWidget(separator);
+ QDialogButtonBox * const buttonBox = new QDialogButtonBox;
+ buttonBox->addButton(QDialogButtonBox::Ok);
+ connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+ mainLayout->addWidget(buttonBox);
+ }
+
+private:
+ Q_SLOT void showSettingsPage()
+ {
+ Core::ICore::instance()->showOptionsDialog(MaemoQemuSettingsPage::Category,
+ MaemoQemuSettingsPage::Id);
+ accept();
+ }
+};
+
+} // anonymous namespace
MaemoDeviceConfigurationsSettingsPage::MaemoDeviceConfigurationsSettingsPage(QObject *parent)
: Core::IOptionsPage(parent)
QString MaemoDeviceConfigurationsSettingsPage::id() const
{
- return QLatin1String("ZZ.Maemo Device Configurations");
+ return Id;
}
QString MaemoDeviceConfigurationsSettingsPage::displayName() const
QString MaemoDeviceConfigurationsSettingsPage::category() const
{
- return QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+ return Category;
}
QString MaemoDeviceConfigurationsSettingsPage::displayCategory() const
{
}
+const QString MaemoDeviceConfigurationsSettingsPage::Id
+ = QLatin1String("ZZ.Maemo Device Configurations");
+const QString MaemoDeviceConfigurationsSettingsPage::Category
+ = QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+
MaemoQemuSettingsPage::MaemoQemuSettingsPage(QObject *parent)
: Core::IOptionsPage(parent)
QString MaemoQemuSettingsPage::id() const
{
- return QLatin1String("ZZ.Qemu Settings");
+ return Id;
}
QString MaemoQemuSettingsPage::displayName() const
QString MaemoQemuSettingsPage::category() const
{
- return QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+ return Category;
}
QString MaemoQemuSettingsPage::displayCategory() const
{
}
-
-class MaemoQemuCrashDialog : public QDialog
-{
- Q_OBJECT
-public:
- MaemoQemuCrashDialog(MaemoQemuSettingsPage *settingsPage)
- : m_settingsPage(settingsPage)
- {
- setWindowTitle(tr("Qemu error"));
- QString message = tr("Qemu crashed.") + QLatin1String(" <p>");
- const MaemoQemuSettings::OpenGlMode openGlMode
- = MaemoQemuSettings::openGlMode();
- const QString linkString = QLatin1String("</p><a href=\"dummy\">")
- + tr("Click here to change the OpenGL mode.")
- + QLatin1String("</a>");
- if (openGlMode == MaemoQemuSettings::HardwareAcceleration) {
- message += tr("You have configured Qemu to use OpenGL "
- "hardware acceleration, which might not be supported by "
- "your system. You could try using software rendering instead.");
- message += linkString;
- } else if (openGlMode == MaemoQemuSettings::AutoDetect) {
- message += tr("Qemu is currently configured to auto-detect the "
- "OpenGL mode, which is known to not work in some cases. "
- "You might want to use software rendering instead.");
- message += linkString;
- }
- QLabel * const messageLabel = new QLabel(message, this);
- messageLabel->setWordWrap(true);
- messageLabel->setTextFormat(Qt::RichText);
- connect(messageLabel, SIGNAL(linkActivated(QString)),
- SLOT(showSettingsPage()));
- QVBoxLayout *mainLayout = new QVBoxLayout(this);
- mainLayout->addWidget(messageLabel);
- QFrame * const separator = new QFrame;
- separator->setFrameShape(QFrame::HLine);
- separator->setFrameShadow(QFrame::Sunken);
- mainLayout->addWidget(separator);
- QDialogButtonBox * const buttonBox = new QDialogButtonBox;
- buttonBox->addButton(QDialogButtonBox::Ok);
- connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
- mainLayout->addWidget(buttonBox);
- }
-
-private:
- Q_SLOT void showSettingsPage()
- {
- Core::ICore::instance()->showOptionsDialog(m_settingsPage->category(),
- m_settingsPage->id());
- accept();
- }
-
- MaemoQemuSettingsPage * const m_settingsPage;
-};
-
-
void MaemoQemuSettingsPage::showQemuCrashDialog()
{
- MaemoQemuCrashDialog dlg(this);
+ MaemoQemuCrashDialog dlg(Core::ICore::instance()->mainWindow());
dlg.exec();
}
+const QString MaemoQemuSettingsPage::Id = QLatin1String("ZZ.Qemu Settings");
+const QString MaemoQemuSettingsPage::Category
+ = QLatin1String(Constants::MAEMO_SETTINGS_CATEGORY);
+
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "maemosettingspages.moc"
#include <coreplugin/dialogs/ioptionspage.h>
-namespace Qt4ProjectManager{
+namespace RemoteLinux{
namespace Internal {
class MaemoDeviceConfigurationsSettingsWidget;
{
Q_OBJECT
public:
- MaemoDeviceConfigurationsSettingsPage(QObject *parent);
+ MaemoDeviceConfigurationsSettingsPage(QObject *parent = 0);
~MaemoDeviceConfigurationsSettingsPage();
virtual QString id() const;
virtual void apply();
virtual void finish();
+ static const QString Id;
+ static const QString Category;
+
private:
QString m_keywords;
MaemoDeviceConfigurationsSettingsWidget *m_widget;
{
Q_OBJECT
public:
- MaemoQemuSettingsPage(QObject *parent);
+ MaemoQemuSettingsPage(QObject *parent = 0);
~MaemoQemuSettingsPage();
virtual QString id() const;
virtual void apply();
virtual void finish();
- void showQemuCrashDialog();
+ static const QString Id;
+ static const QString Category;
+
+ static void showQemuCrashDialog();
private:
QString m_keywords;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOSETTINGSPAGES_H
#include <QtNetwork/QHostInfo>
using namespace Utils;
-using namespace Qt4ProjectManager::Internal;
+using namespace RemoteLinux::Internal;
MaemoSshConfigDialog::MaemoSshConfigDialog(QWidget *parent)
: QDialog(parent)
? SshKeyGenerator::Rsa
: SshKeyGenerator::Dsa;
- QByteArray userId = QString(home.mid(home.lastIndexOf(QLatin1Char('/')) + 1)
- + QLatin1Char('@') + QHostInfo::localHostName()).toUtf8();
-
QApplication::setOverrideCursor(Qt::BusyCursor);
if (m_keyGenerator->generateKeys(keyType, SshKeyGenerator::OpenSsl,
class SshKeyGenerator;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoSshConfigDialog : public QDialog
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
+using namespace Qt4ProjectManager;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoSshRunner::MaemoSshRunner(QObject *parent,
= std::numeric_limits<qint64>::min();
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcess;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoRemoteMounter;
class MaemoRunConfiguration;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOSSHRUNNER_H
#include "maemotoolchain.h"
#include "maemoglobal.h"
-#include "maemomanager.h"
#include "maemoqtversion.h"
-#include "qt4projectmanagerconstants.h"
#include <projectexplorer/gccparser.h>
#include <projectexplorer/headerpath.h>
#include <projectexplorer/toolchainmanager.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/environment.h>
#include <qtsupport/qtversionmanager.h>
#include <QtGui/QLabel>
#include <QtGui/QVBoxLayout>
-namespace Qt4ProjectManager {
+using namespace Qt4ProjectManager;
+
+namespace RemoteLinux {
namespace Internal {
static const char *const MAEMO_QT_VERSION_KEY = "Qt4ProjectManager.Maemo.QtVersion";
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <projectexplorer/gcctoolchain.h>
#include <projectexplorer/toolchainconfigwidget.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOTOOLCHAIN_H
using namespace ProjectExplorer;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
AbstractMaemoUploadAndInstallStep::AbstractMaemoUploadAndInstallStep(BuildStepList *parent, const QString &id)
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include "abstractmaemodeploystep.h"
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageInstaller;
class MaemoPackageUploader;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEP_H
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
MaemoUsedPortsGatherer::MaemoUsedPortsGatherer(QObject *parent) :
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
class SshRemoteProcessRunner;
}
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // MAEMOUSEDPORTSGATHERER_H
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorerconstants.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4target.h>
using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
namespace {
const QString OldDeployConfigId = QLatin1String("2.2MaemoDeployConfig");
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#include <QtCore/QSharedPointer>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
class MaemoPerTargetDeviceConfigurationListModel;
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // QT4PROJECTMANAGER_QT4DEPLOYCONFIGURATION_H
#include <utils/filesystemwatcher.h>
#include <qtsupport/baseqtversion.h>
-
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
#include <QtCore/QBuffer>
#include <cctype>
using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+
+namespace RemoteLinux {
+namespace Internal {
namespace {
const QByteArray NameFieldName("Package");
{
return QLatin1String("meego.spec");
}
+
+} // namespace Internal
+} // namespace RemoteLinux
#ifndef QT4MAEMOTARGET_H
#define QT4MAEMOTARGET_H
-#include "qt4target.h"
+#include <qt4projectmanager/qt4target.h>
#include <QtCore/QIODevice>
#include <QtCore/QSharedPointer>
QT_FORWARD_DECLARE_CLASS(QFile)
-namespace Utils {
-class FileSystemWatcher;
-}
-namespace Qt4ProjectManager {
-class Qt4Project;
+namespace Qt4ProjectManager { class Qt4Project; }
+namespace Utils { class FileSystemWatcher; }
+
+namespace RemoteLinux {
namespace Internal {
class Qt4MaemoDeployConfigurationFactory;
class WatchableFile;
-class AbstractQt4MaemoTarget : public Qt4BaseTarget
+class AbstractQt4MaemoTarget : public Qt4ProjectManager::Qt4BaseTarget
{
friend class Qt4MaemoTargetFactory;
Q_OBJECT
public:
- explicit AbstractQt4MaemoTarget(Qt4Project *parent, const QString &id);
+ explicit AbstractQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
virtual ~AbstractQt4MaemoTarget();
- Qt4BuildConfigurationFactory *buildConfigurationFactory() const;
+ Qt4ProjectManager::Qt4BuildConfigurationFactory *buildConfigurationFactory() const;
void createApplicationProFiles();
QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Node *n);
QList<ProjectExplorer::ToolChain *> possibleToolChains(ProjectExplorer::BuildConfiguration *bc) const;
bool initPackagingSettingsFromOtherTarget();
virtual bool initAdditionalPackagingSettingsFromOtherTarget()=0;
- Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
+ Qt4ProjectManager::Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
bool m_isInitialized;
};
{
Q_OBJECT
public:
- AbstractDebBasedQt4MaemoTarget(Qt4Project *parent, const QString &id);
+ AbstractDebBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
~AbstractDebBasedQt4MaemoTarget();
QString debianDirPath() const;
{
Q_OBJECT
public:
- AbstractRpmBasedQt4MaemoTarget(Qt4Project *parent, const QString &id);
+ AbstractRpmBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
~AbstractRpmBasedQt4MaemoTarget();
virtual bool allowsRemoteMounts() const { return false; }
{
Q_OBJECT
public:
- explicit Qt4Maemo5Target(Qt4Project *parent, const QString &id);
+ explicit Qt4Maemo5Target(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
virtual ~Qt4Maemo5Target();
virtual bool allowsRemoteMounts() const { return true; }
{
Q_OBJECT
public:
- explicit Qt4HarmattanTarget(Qt4Project *parent, const QString &id);
+ explicit Qt4HarmattanTarget(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
virtual ~Qt4HarmattanTarget();
virtual bool allowsRemoteMounts() const { return false; }
{
Q_OBJECT
public:
- explicit Qt4MeegoTarget(Qt4Project *parent, const QString &id);
+ explicit Qt4MeegoTarget(Qt4ProjectManager::Qt4Project *parent,
+ const QString &id);
virtual ~Qt4MeegoTarget();
static QString defaultDisplayName();
private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // QT4MAEMOTARGET_H
**************************************************************************/
#include "qt4maemotargetfactory.h"
-#include "buildconfigurationinfo.h"
-#include "qt4project.h"
-#include "qt4projectmanagerconstants.h"
#include "maemoglobal.h"
#include "maemopackagecreationstep.h"
#include "maemorunconfiguration.h"
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
+#include <qt4projectmanager/buildconfigurationinfo.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/qtcassert.h>
using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace Qt4ProjectManager::Constants;
using ProjectExplorer::idFromMap;
+namespace RemoteLinux {
+namespace Internal {
+
// -------------------------------------------------------------------------
// Qt4MaemoTargetFactory
// -------------------------------------------------------------------------
QStringList targetIds;
if (parent && !qobject_cast<Qt4Project *>(parent))
return targetIds;
- if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)).isEmpty())
- targetIds << QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID);
- if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID)).isEmpty())
- targetIds << QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID);
- if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID)).isEmpty())
- targetIds << QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID);
+ if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(MAEMO5_DEVICE_TARGET_ID)).isEmpty())
+ targetIds << QLatin1String(MAEMO5_DEVICE_TARGET_ID);
+ if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(HARMATTAN_DEVICE_TARGET_ID)).isEmpty())
+ targetIds << QLatin1String(HARMATTAN_DEVICE_TARGET_ID);
+ if (!QtSupport::QtVersionManager::instance()->versionsForTargetId(QLatin1String(MEEGO_DEVICE_TARGET_ID)).isEmpty())
+ targetIds << QLatin1String(MEEGO_DEVICE_TARGET_ID);
return targetIds;
}
QString Qt4MaemoTargetFactory::displayNameForId(const QString &id) const
{
- if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+ if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
return Qt4Maemo5Target::defaultDisplayName();
- else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
return Qt4HarmattanTarget::defaultDisplayName();
- else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
return Qt4MeegoTarget::defaultDisplayName();
return QString();
}
const QString id = idFromMap(map);
AbstractQt4MaemoTarget *target = 0;
Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
- if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+ if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
target = new Qt4Maemo5Target(qt4project, QLatin1String("transient ID"));
- else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
target = new Qt4HarmattanTarget(qt4project, QLatin1String("transient ID"));
- else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
target = new Qt4MeegoTarget(qt4project, QLatin1String("transient ID"));
if (target->fromMap(map))
return target;
QString Qt4MaemoTargetFactory::buildNameForId(const QString &id) const
{
- if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+ if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
return QLatin1String("maemo");
- else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
return QLatin1String("harmattan");
- else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))
+ else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
return QLatin1String("meego");
else
return QString();
AbstractQt4MaemoTarget *target = 0;
QStringList deployConfigIds;
- if (id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)) {
+ if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID)) {
target = new Qt4Maemo5Target(static_cast<Qt4Project *>(parent), id);
deployConfigIds << Qt4MaemoDeployConfiguration::FremantleWithPackagingId
<< Qt4MaemoDeployConfiguration::FremantleWithoutPackagingId;
- } else if (id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID)) {
+ } else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID)) {
target = new Qt4HarmattanTarget(static_cast<Qt4Project *>(parent), id);
deployConfigIds << Qt4MaemoDeployConfiguration::HarmattanId;
- } else if (id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID)) {
+ } else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID)) {
target = new Qt4MeegoTarget(static_cast<Qt4Project *>(parent), id);
deployConfigIds << Qt4MaemoDeployConfiguration::MeegoId;
}
target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target));
return target;
}
+
+} // namespace Internal
+} // namespace RemoteLinux
#ifndef QT4MAEMOTARGETFACTORY_H
#define QT4MAEMOTARGETFACTORY_H
-#include "qt4basetargetfactory.h"
+#include <qt4projectmanager/qt4basetargetfactory.h>
-namespace Qt4ProjectManager {
+namespace RemoteLinux {
namespace Internal {
-class Qt4MaemoTargetFactory : public Qt4BaseTargetFactory
+class Qt4MaemoTargetFactory : public Qt4ProjectManager::Qt4BaseTargetFactory
{
Q_OBJECT
public:
bool supportsTargetId(const QString &id) const;
ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
- ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos);
+ ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id,
+ const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos);
bool isMobileTarget(const QString &id);
bool supportsShadowBuilds(const QString &id);
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace RemoteLinux
#endif // QT4MAEMOTARGETFACTORY_H
--- /dev/null
+include(remotelinux_dependencies.pri)
+
+LIBS *= -l$$qtLibraryName(RemoteLinux)
--- /dev/null
+TEMPLATE = lib
+TARGET = RemoteLinux
+
+include(../../qtcreatorplugin.pri)
+include(../../shared/proparser/proparser.pri)
+include(remotelinux_dependencies.pri)
+
+message(target.path = $$target.path)
+
+HEADERS += \
+ remotelinuxplugin.h \
+ remotelinux_export.h \
+ maemoconfigtestdialog.h \
+ maemoconstants.h \
+ maemodeviceconfigurations.h \
+ maemorunconfiguration.h \
+ maemorunconfigurationwidget.h \
+ maemoruncontrol.h \
+ maemorunfactories.h \
+ maemosettingspages.h \
+ maemodeviceconfigurationssettingswidget.h \
+ maemosshconfigdialog.h \
+ maemotoolchain.h \
+ maemopackagecreationstep.h \
+ maemopackagecreationfactory.h \
+ maemopackagecreationwidget.h \
+ maemodeployablelistmodel.h \
+ maemoqemumanager.h \
+ maemodeployables.h \
+ maemodeployable.h \
+ maemodeploystepwidget.h \
+ maemodeploystepfactory.h \
+ maemoglobal.h \
+ maemosshrunner.h \
+ maemodebugsupport.h \
+ maemoanalyzersupport.h \
+ maemoremotemountsmodel.h \
+ maemodeviceenvreader.h \
+ maemomountspecification.h \
+ maemoremotemounter.h \
+ maemoprofilesupdatedialog.h \
+ maemousedportsgatherer.h \
+ maemoremoteprocesslist.h \
+ maemoremoteprocessesdialog.h \
+ maemopublishingwizardfactories.h \
+ maemopublishingbuildsettingspagefremantlefree.h \
+ maemopublishingfileselectiondialog.h \
+ maemopublishedprojectmodel.h \
+ maemopublishinguploadsettingspagefremantlefree.h \
+ maemopublishingwizardfremantlefree.h \
+ maemopublishingresultpagefremantlefree.h \
+ maemopublisherfremantlefree.h \
+ maemoqemuruntime.h \
+ maemoqemuruntimeparser.h \
+ maemoqemusettingswidget.h \
+ maemoqemusettings.h \
+ qt4maemotargetfactory.h \
+ qt4maemotarget.h \
+ qt4maemodeployconfiguration.h \
+ maemodeviceconfigwizard.h \
+ maemokeydeployer.h \
+ maemopertargetdeviceconfigurationlistmodel.h \
+ maemodeployconfigurationwidget.h \
+ maemoinstalltosysrootstep.h \
+ maemodeploymentmounter.h \
+ maemopackageuploader.h \
+ maemopackageinstaller.h \
+ maemoremotecopyfacility.h \
+ abstractmaemodeploystep.h \
+ maemodeploybymountstep.h \
+ maemouploadandinstalldeploystep.h \
+ maemodirectdeviceuploadstep.h \
+ abstractlinuxdevicedeploystep.h \
+ maemoqtversionfactory.h \
+ maemoqtversion.h
+
+SOURCES += \
+ remotelinuxplugin.cpp \
+ maemoconfigtestdialog.cpp \
+ maemodeviceconfigurations.cpp \
+ maemorunconfiguration.cpp \
+ maemorunconfigurationwidget.cpp \
+ maemoruncontrol.cpp \
+ maemorunfactories.cpp \
+ maemosettingspages.cpp \
+ maemodeviceconfigurationssettingswidget.cpp \
+ maemosshconfigdialog.cpp \
+ maemotoolchain.cpp \
+ maemopackagecreationstep.cpp \
+ maemopackagecreationfactory.cpp \
+ maemopackagecreationwidget.cpp \
+ maemodeployablelistmodel.cpp \
+ maemoqemumanager.cpp \
+ maemodeployables.cpp \
+ maemodeploystepwidget.cpp \
+ maemodeploystepfactory.cpp \
+ maemoglobal.cpp \
+ maemosshrunner.cpp \
+ maemodebugsupport.cpp \
+ maemoanalyzersupport.cpp \
+ maemoremotemountsmodel.cpp \
+ maemodeviceenvreader.cpp \
+ maemomountspecification.cpp \
+ maemoremotemounter.cpp \
+ maemoprofilesupdatedialog.cpp \
+ maemousedportsgatherer.cpp \
+ maemoremoteprocesslist.cpp \
+ maemoremoteprocessesdialog.cpp \
+ maemopublishingwizardfactories.cpp \
+ maemopublishingbuildsettingspagefremantlefree.cpp \
+ maemopublishingfileselectiondialog.cpp \
+ maemopublishedprojectmodel.cpp \
+ maemopublishinguploadsettingspagefremantlefree.cpp \
+ maemopublishingwizardfremantlefree.cpp \
+ maemopublishingresultpagefremantlefree.cpp \
+ maemopublisherfremantlefree.cpp \
+ maemoqemuruntimeparser.cpp \
+ maemoqemusettingswidget.cpp \
+ maemoqemusettings.cpp \
+ qt4maemotargetfactory.cpp \
+ qt4maemotarget.cpp \
+ qt4maemodeployconfiguration.cpp \
+ maemodeviceconfigwizard.cpp \
+ maemokeydeployer.cpp \
+ maemopertargetdeviceconfigurationlistmodel.cpp \
+ maemodeployconfigurationwidget.cpp \
+ maemoinstalltosysrootstep.cpp \
+ maemodeploymentmounter.cpp \
+ maemopackageuploader.cpp \
+ maemopackageinstaller.cpp \
+ maemoremotecopyfacility.cpp \
+ abstractmaemodeploystep.cpp \
+ maemodeploybymountstep.cpp \
+ maemouploadandinstalldeploystep.cpp \
+ maemodirectdeviceuploadstep.cpp \
+ abstractlinuxdevicedeploystep.cpp \
+ maemoqtversionfactory.cpp \
+ maemoqtversion.cpp
+
+FORMS += \
+ maemoconfigtestdialog.ui \
+ maemodeviceconfigurationssettingswidget.ui \
+ maemosshconfigdialog.ui \
+ maemopackagecreationwidget.ui \
+ maemodeploystepwidget.ui \
+ maemoprofilesupdatedialog.ui \
+ maemoremoteprocessesdialog.ui \
+ maemopublishingbuildsettingspagefremantlefree.ui \
+ maemopublishingfileselectiondialog.ui \
+ maemopublishinguploadsettingspagefremantlefree.ui \
+ maemopublishingresultpagefremantlefree.ui \
+ maemoqemusettingswidget.ui \
+ maemodeviceconfigwizardstartpage.ui \
+ maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
+ maemodeviceconfigwizardreusekeyscheckpage.ui \
+ maemodeviceconfigwizardkeycreationpage.ui \
+ maemodeviceconfigwizardkeydeploymentpage.ui \
+ maemodeployconfigurationwidget.ui \
+ maemodeviceconfigwizardlogindatapage.ui
+
+RESOURCES += qt-maemo.qrc
+DEFINES += QT_NO_CAST_TO_ASCII
+DEFINES += REMOTELINUX_LIBRARY
--- /dev/null
+include(../../plugins/analyzerbase/analyzerbase.pri)
+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../plugins/debugger/debugger.pri)
+include(../../plugins/projectexplorer/projectexplorer.pri)
+include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
--- /dev/null
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef REMOTE_LINUX_EXPORT_H
+#define REMOTE_LINUX_EXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(REMOTELINUX_LIBRARY)
+# define REMOTELINUX_EXPORT Q_DECL_EXPORT
+#else
+# define REMOTELINUX_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // REMOTE_LINUX_EXPORT_H
--- /dev/null
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "remotelinuxplugin.h"
+
+#include "maemoconstants.h"
+#include "maemodeployable.h"
+#include "maemodeploystepfactory.h"
+#include "maemodeviceconfigurations.h"
+#include "maemoglobal.h"
+#include "maemopackagecreationfactory.h"
+#include "maemopublishingwizardfactories.h"
+#include "maemoqemumanager.h"
+#include "maemorunfactories.h"
+#include "maemosettingspages.h"
+#include "maemotoolchain.h"
+#include "qt4maemodeployconfiguration.h"
+#include "maemoqtversionfactory.h"
+#include "qt4maemotargetfactory.h"
+#include "qt4projectmanager/qt4projectmanagerconstants.h"
+
+#include <QtCore/QtPlugin>
+
+namespace RemoteLinux {
+namespace Internal {
+
+RemoteLinuxPlugin::RemoteLinuxPlugin()
+{
+}
+
+RemoteLinuxPlugin::~RemoteLinuxPlugin()
+{
+}
+
+bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
+ QString *error_message)
+{
+ Q_UNUSED(arguments)
+ Q_UNUSED(error_message)
+
+ MaemoQemuManager::instance(this);
+ MaemoDeviceConfigurations::instance(this);
+
+ addAutoReleasedObject(new MaemoRunControlFactory);
+ addAutoReleasedObject(new MaemoRunConfigurationFactory);
+ addAutoReleasedObject(new MaemoToolChainFactory);
+ addAutoReleasedObject(new Qt4MaemoDeployConfigurationFactory);
+ addAutoReleasedObject(new MaemoPackageCreationFactory);
+ addAutoReleasedObject(new MaemoDeployStepFactory);
+ addAutoReleasedObject(new MaemoDeviceConfigurationsSettingsPage);
+ addAutoReleasedObject(new MaemoQemuSettingsPage);
+ addAutoReleasedObject(new MaemoPublishingWizardFactoryFremantleFree);
+ addAutoReleasedObject(new Qt4MaemoTargetFactory);
+ addAutoReleasedObject(new MaemoQtVersionFactory);
+
+ qRegisterMetaType<MaemoDeployable>("MaemoDeployable");
+
+ return true;
+}
+
+void RemoteLinuxPlugin::extensionsInitialized()
+{
+}
+
+} // namespace Internal
+} // namespace RemoteLinux
+
+Q_EXPORT_PLUGIN(RemoteLinux::Internal::RemoteLinuxPlugin)
--- /dev/null
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef REMOTELINUXPLUGIN_H
+#define REMOTELINUXPLUGIN_H
+
+#include <extensionsystem/iplugin.h>
+
+namespace RemoteLinux {
+namespace Internal {
+
+class RemoteLinuxPlugin : public ExtensionSystem::IPlugin
+{
+ Q_OBJECT
+public:
+ RemoteLinuxPlugin();
+ ~RemoteLinuxPlugin();
+
+ bool initialize(const QStringList &arguments, QString *error_message);
+ void extensionsInitialized();
+};
+
+} // namespace Internal
+} // namespace RemoteLinux
+
+#endif // REMOTELINUXPLUGIN_H