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

Maemo: Create dedicated plugin.

Browse Source 
No change in functionality for now. More support for generic remote
Linux support is planned to be added.

The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.

Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Christian Kandeler
2011-05-25 11:23:25 +02:00
parent fce956895b
commit 64ba06e221
181 changed files with 1215 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/plugins.pro
View File

@@ -42,7 +42,8 @@ SUBDIRS = plugin_coreplugin \
plugin_qmljstools \
plugin_macros \
debugger/dumper.pro \
plugin_qmlprofiler
plugin_qmlprofiler \
plugin_remotelinux
!win32 {
SUBDIRS += plugin_valgrind
@@ -149,7 +150,13 @@ plugin_qt4projectmanager.depends += plugin_qtsupport
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

3
src/plugins/qt4projectmanager/findqt4profiles.h
View File

@@ -36,9 +36,8 @@
#include <projectexplorer/nodesvisitor.h>
namespace Qt4ProjectManager {
namespace Internal {
class Qt4ProFileNode;
namespace Internal {
class FindQt4ProFiles: protected ProjectExplorer::NodesVisitor {

3
src/plugins/qt4projectmanager/librarydetailscontroller.h
View File

@@ -37,14 +37,13 @@
#include "addlibrarywizard.h"
namespace Qt4ProjectManager {
class Qt4ProFileNode;
namespace Internal {
namespace Ui {
class LibraryDetailsWidget;
}
class Qt4ProFileNode;
class LibraryDetailsController : public QObject
{
Q_OBJECT

45
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -31,6 +31,7 @@
**************************************************************************/
#include "qmakestep.h"
#include "ui_qmakestep.h"
#include <projectexplorer/projectexplorerconstants.h>
#include "qmakeparser.h"
@@ -465,16 +466,17 @@ bool QMakeStep::fromMap(const QVariantMap &map)
////
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()));
@@ -490,10 +492,15 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
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();
@@ -531,7 +538,7 @@ void QMakeStepConfigWidget::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();
@@ -541,7 +548,7 @@ void QMakeStepConfigWidget::userArgumentsChanged()
{
if (m_ignoreChange)
return;
m_ui.qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
m_ui->qmakeAdditonalArgumentsLineEdit->setText(m_step->userArguments());
updateSummaryLabel();
updateEffectiveQMakeCall();
}
@@ -550,7 +557,7 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged()
{
if (m_ignoreChange)
return;
m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary());
updateSummaryLabel();
updateEffectiveQMakeCall();
@@ -560,7 +567,7 @@ void QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged()
void QMakeStepConfigWidget::qmakeArgumentsLineEdited()
{
m_ignoreChange = true;
m_step->setUserArguments(m_ui.qmakeAdditonalArgumentsLineEdit->text());
m_step->setUserArguments(m_ui->qmakeAdditonalArgumentsLineEdit->text());
m_ignoreChange = false;
updateSummaryLabel();
@@ -573,7 +580,7 @@ void QMakeStepConfigWidget::buildConfigurationSelected()
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;
@@ -638,13 +645,13 @@ void QMakeStepConfigWidget::updateSummaryLabel()
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;
@@ -653,8 +660,8 @@ void QMakeStepConfigWidget::updateQmlDebuggingOption()
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()
@@ -664,7 +671,7 @@ 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());
}
////

9
src/plugins/qt4projectmanager/qmakestep.h
View File

@@ -33,7 +33,11 @@
#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>
@@ -137,6 +141,7 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
Q_OBJECT
public:
QMakeStepConfigWidget(QMakeStep *step);
~QMakeStepConfigWidget();
void init();
QString summaryText() const;
QString displayName() const;
@@ -160,7 +165,7 @@ private:
void updateSummaryLabel();
void updateQmlDebuggingOption();
void updateEffectiveQMakeCall();
Ui::QMakeStep m_ui;
Ui::QMakeStep *m_ui;
QMakeStep *m_step;
QString m_summaryText;
bool m_ignoreChange;

12
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -153,7 +153,7 @@ void Qt4RunConfiguration::handleParseState(bool success)
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;
@@ -161,7 +161,7 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFile
emit effectiveTargetInformationChanged();
}
void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Qt4ProFileNode *pro)
{
if (pro->path() != m_proFilePath)
return;
@@ -174,11 +174,11 @@ void Qt4RunConfiguration::ctor()
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*)));
}
//////

6
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
View File

@@ -62,11 +62,11 @@ namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BaseTarget;
class Qt4ProFileNode;
namespace Internal {
class Qt4DesktopTarget;
class Qt4PriFileNode;
class Qt4ProFileNode;
class Qt4RunConfigurationFactory;
class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
@@ -117,8 +117,8 @@ signals:
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);

127
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View File

@@ -1,127 +0,0 @@
/**************************************************************************
**
** 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

86
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
View File

@@ -1,86 +0,0 @@
/**************************************************************************
**
** 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

151
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
View File

@@ -1,151 +0,0 @@
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

4
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View File

@@ -117,9 +117,9 @@ void S60DeployConfiguration::ctor()
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*)));

2
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
View File

@@ -46,10 +46,10 @@ class BaseQtVersion;
}
namespace Qt4ProjectManager {
class Qt4ProFileNode;
namespace Internal {
class Qt4SymbianTarget;
class Qt4ProFileNode;
class S60DeployConfigurationFactory;
class S60DeviceRunConfiguration;

12
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -118,10 +118,10 @@ void S60DeviceRunConfiguration::ctor()
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)
@@ -132,14 +132,14 @@ 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;

6
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View File

@@ -47,11 +47,11 @@ QT_END_NAMESPACE
namespace Qt4ProjectManager {
class Qt4BaseTarget;
class Qt4ProFileNode;
namespace Internal {
class SymbianQtVersion;
class Qt4SymbianTarget;
class Qt4ProFileNode;
class S60DeviceRunConfigurationFactory;
class CodaRunControl;
@@ -97,8 +97,8 @@ protected:
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();

12
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View File

@@ -100,10 +100,10 @@ void S60EmulatorRunConfiguration::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 *)));
}
@@ -120,14 +120,14 @@ void S60EmulatorRunConfiguration::handleParserState(bool success)
}
}
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;

6
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
View File

@@ -51,10 +51,10 @@ class DetailsWidget;
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BaseTarget;
class Qt4ProFileNode;
namespace Internal {
class Qt4SymbianTarget;
class Qt4ProFileNode;
class S60EmulatorRunConfigurationFactory;
class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
@@ -84,8 +84,8 @@ signals:
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);

4
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -249,7 +249,7 @@ QString Qt4BuildConfiguration::buildDirectory() const
/// 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;
}
@@ -260,7 +260,7 @@ Qt4ProjectManager::Internal::Qt4ProFileNode *Qt4BuildConfiguration::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;
}

9
src/plugins/qt4projectmanager/qt4buildconfiguration.h
View File

@@ -48,10 +48,7 @@ class QMakeStep;
class MakeStep;
class Qt4BaseTarget;
class Qt4BuildConfigurationFactory;
namespace Internal {
class Qt4ProFileNode;
}
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
{
@@ -71,8 +68,8 @@ public:
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;
@@ -166,7 +163,7 @@ private:
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

177
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -464,7 +464,7 @@ struct InternalNode
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;
@@ -476,7 +476,7 @@ struct InternalNode
++existingNodeIter;
}
while (newPathIter != files.constEnd()) {
filesToAdd << new FileNode(*newPathIter, type, false);
filesToAdd << new ProjectExplorer::FileNode(*newPathIter, type, false);
++newPathIter;
}
@@ -538,7 +538,7 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader
{
// 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;
@@ -825,7 +825,7 @@ QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) c
break;
}
FileNode *fileNode = qobject_cast<FileNode *>(node);
ProjectExplorer::FileNode *fileNode = qobject_cast<FileNode *>(node);
if (fileNode && fileNode->fileType() != ProjectExplorer::ProjectFileType)
actions << Rename;
@@ -1251,6 +1251,51 @@ QSet<QString> Qt4PriFileNode::filterFiles(ProjectExplorer::FileType fileType, co
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
{
@@ -1355,7 +1400,7 @@ Qt4ProFileNode::~Qt4ProFileNode()
{
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());
@@ -1408,8 +1453,8 @@ QStringList Qt4ProFileNode::variableValue(const Qt4Variable var) const
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()) {
@@ -1421,8 +1466,8 @@ void Qt4ProFileNode::emitProFileUpdated()
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()) {
@@ -1459,8 +1504,8 @@ void Qt4ProFileNode::update()
{
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);
}
@@ -1507,25 +1552,6 @@ void Qt4ProFileNode::applyAsyncEvaluate()
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)
@@ -1538,8 +1564,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
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;
}
@@ -1547,7 +1573,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
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;
@@ -1565,8 +1591,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
// 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);
}
@@ -1777,8 +1803,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
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);
}
@@ -1789,8 +1815,8 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
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);
@@ -1800,25 +1826,6 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
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.
@@ -1832,9 +1839,9 @@ QStringList Qt4ProFileNode::updateUiFiles()
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();
@@ -1843,8 +1850,8 @@ QStringList Qt4ProFileNode::updateUiFiles()
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;
}
@@ -1852,7 +1859,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
// 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())
@@ -1860,15 +1867,15 @@ QStringList Qt4ProFileNode::updateUiFiles()
}
// 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()) {
@@ -1876,7 +1883,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
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();
@@ -1895,13 +1902,13 @@ QStringList Qt4ProFileNode::updateUiFiles()
++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);
}
@@ -1910,7 +1917,7 @@ QStringList Qt4ProFileNode::updateUiFiles()
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();
@@ -2216,15 +2223,15 @@ void Qt4ProFileNode::invalidate()
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)
@@ -2236,7 +2243,7 @@ void Qt4ProFileNode::updateCodeModelSupportFromBuild(const QStringList &files)
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);
@@ -2269,39 +2276,39 @@ void Qt4ProFileNode::createUiCodeModelSupport()
= 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());
@@ -2309,10 +2316,4 @@ void Qt4ProFileNode::createUiCodeModelSupport()
}
}
Qt4NodesWatcher::Qt4NodesWatcher(QObject *parent)
: NodesWatcher(parent)
{
}
} // namespace Internal
} // namespace Qt4ProjectManager

152
src/plugins/qt4projectmanager/qt4nodes.h
View File

@@ -62,29 +62,9 @@ class ProFileReader;
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,
@@ -110,32 +90,29 @@ enum Qt4Variable {
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
@@ -210,7 +187,7 @@ private:
QString m_projectDir;
QMap<QString, Qt4UiCodeModelSupport *> m_uiCodeModelSupport;
Qt4PriFile *m_qt4PriFile;
Internal::Qt4PriFile *m_qt4PriFile;
// Memory is cheap...
// TODO (really that cheap?)
@@ -219,13 +196,64 @@ private:
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;
@@ -260,26 +288,26 @@ struct TargetInformation
};
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)
@@ -375,32 +403,6 @@ private:
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

14
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -338,11 +338,11 @@ bool Qt4Project::fromMap(const QVariantMap &map)
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();
@@ -616,7 +616,7 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
// 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";
@@ -954,8 +954,8 @@ void Qt4Project::collectAllfProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNo
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()) {

26
src/plugins/qt4projectmanager/qt4project.h
View File

@@ -56,11 +56,11 @@ class ProFileReader;
}
namespace Qt4ProjectManager {
class Qt4ProFileNode;
namespace Internal {
class DeployHelperRunStep;
class FileItem;
class Qt4ProFileNode;
class Qt4PriFileNode;
class GCCPreprocessor;
struct Qt4ProjectFiles;
@@ -153,7 +153,7 @@ public:
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;
@@ -161,20 +161,20 @@ public:
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
@@ -188,8 +188,8 @@ public:
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();
@@ -216,9 +216,9 @@ private:
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);
@@ -228,7 +228,7 @@ private:
static QString qmakeVarName(ProjectExplorer::FileType type);
Qt4Manager *m_manager;
Internal::Qt4ProFileNode *m_rootProjectNode;
Qt4ProFileNode *m_rootProjectNode;
Internal::Qt4NodesWatcher *m_nodesWatcher;
Qt4ProjectFile *m_fileInfo;
@@ -250,7 +250,7 @@ private:
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;

1
src/plugins/qt4projectmanager/qt4projectmanager.pro
View File

@@ -148,7 +148,6 @@ RESOURCES += qt4projectmanager.qrc \
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)

1
src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
View File

@@ -2,6 +2,5 @@ include(../../plugins/projectexplorer/projectexplorer.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)

2
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
View File

@@ -53,7 +53,6 @@
#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"
@@ -160,7 +159,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
addAutoReleasedObject(new LinguistExternalEditor);
addAutoReleasedObject(new S60Manager);
addAutoReleasedObject(new MaemoManager);
addAutoReleasedObject(new Qt4DesktopTargetFactory);
addAutoReleasedObject(new Qt4SimulatorTargetFactory);

4
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -52,11 +52,15 @@
#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>

3
src/plugins/qt4projectmanager/qt4target.h
View File

@@ -58,10 +58,7 @@ QT_END_NAMESPACE
namespace Qt4ProjectManager {
class Qt4Project;
class Qt4BaseTargetFactory;
namespace Internal {
class Qt4ProFileNode;
}
class QT4PROJECTMANAGER_EXPORT Qt4BaseTarget : public ProjectExplorer::Target
{

23
src/plugins/remotelinux/RemoteLinux.pluginspec.in Normal file
View File

@@ -0,0 +1,23 @@
<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>

4
src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.cpp → src/plugins/remotelinux/abstractlinuxdevicedeploystep.cpp
View File

@@ -38,7 +38,7 @@
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
@@ -107,4 +107,4 @@ bool LinuxDeviceDeployStepHelper::fromMap(const QVariantMap &map)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/abstractlinuxdevicedeploystep.h → src/plugins/remotelinux/abstractlinuxdevicedeploystep.h
View File

@@ -40,7 +40,7 @@
namespace ProjectExplorer { class DeployConfiguration; }
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class Qt4MaemoDeployConfiguration;
@@ -97,6 +97,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // ABSTRACTLINUXDEVICEDEPLOYSTEP_H

6
src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.cpp → src/plugins/remotelinux/abstractmaemodeploystep.cpp
View File

@@ -45,7 +45,6 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <utils/ssh/sshconnectionmanager.h>
@@ -58,8 +57,9 @@
using namespace Core;
using namespace Utils;
using namespace ProjectExplorer;
using namespace Qt4ProjectManager;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
namespace {
@@ -407,6 +407,6 @@ void MaemoDeployEventHandler::checkForCanceled()
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#include "abstractmaemodeploystep.moc"

8
src/plugins/qt4projectmanager/qt-maemo/abstractmaemodeploystep.h → src/plugins/remotelinux/abstractmaemodeploystep.h
View File

@@ -49,10 +49,10 @@ QT_BEGIN_NAMESPACE
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;
@@ -91,7 +91,7 @@ protected:
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:
@@ -127,6 +127,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // ABSTRACTMAEMODEPLOYSTEP_H

0
src/plugins/qt4projectmanager/qt-maemo/images/qemu-run.png → src/plugins/remotelinux/images/qemu-run.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
src/plugins/qt4projectmanager/qt-maemo/images/qemu-stop.png → src/plugins/remotelinux/images/qemu-stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
src/plugins/qt4projectmanager/qt-maemo/images/qemu.xcf → src/plugins/remotelinux/images/qemu.xcf
View File

4
src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.cpp → src/plugins/remotelinux/maemoanalyzersupport.cpp
View File

@@ -44,7 +44,7 @@ using namespace Utils;
using namespace Analyzer;
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
RunControl *MaemoAnalyzerSupport::createAnalyzerRunControl(MaemoRunConfiguration *runConfig)
@@ -73,4 +73,4 @@ RunControl *MaemoAnalyzerSupport::createAnalyzerRunControl(MaemoRunConfiguration
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemoanalyzersupport.h → src/plugins/remotelinux/maemoanalyzersupport.h
View File

@@ -35,7 +35,7 @@
#include "maemorunconfiguration.h"
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
namespace MaemoAnalyzerSupport {
@@ -45,6 +45,6 @@ ProjectExplorer::RunControl *createAnalyzerRunControl(MaemoRunConfiguration *run
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOANALYZERSUPPORT_H

4
src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp → src/plugins/remotelinux/maemoconfigtestdialog.cpp
View File

@@ -43,7 +43,7 @@
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoConfigTestDialog::MaemoConfigTestDialog(const MaemoDeviceConfig::ConstPtr &config,
@@ -301,4 +301,4 @@ QString MaemoConfigTestDialog::parseTestOutput()
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.h → src/plugins/remotelinux/maemoconfigtestdialog.h
View File

@@ -44,7 +44,7 @@ namespace Utils {
class SshRemoteProcessRunner;
} // namespace Utils
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
@@ -91,6 +91,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOCONFIGTESTDIALOG_H

0
src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui → src/plugins/remotelinux/maemoconfigtestdialog.ui
View File

4
src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h → src/plugins/remotelinux/maemoconstants.h
View File

@@ -34,7 +34,7 @@
#include <QtCore/QLatin1String>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
#define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
@@ -69,6 +69,6 @@ const char * const MAEMO_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectMan
const char * const MAEMO_SETTINGS_CATEGORY_ICON = ":/projectexplorer/images/MaemoDevice.png";
}
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOCONSTANTS_H

4
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp → src/plugins/remotelinux/maemodebugsupport.cpp
View File

@@ -53,7 +53,7 @@ using namespace Utils;
using namespace Debugger;
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runConfig)
@@ -319,4 +319,4 @@ bool MaemoDebugSupport::setPort(int &port)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h → src/plugins/remotelinux/maemodebugsupport.h
View File

@@ -45,7 +45,7 @@ class DebuggerEngine;
}
namespace ProjectExplorer { class RunControl; }
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
@@ -100,6 +100,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEBUGSUPPORT_H

4
src/plugins/qt4projectmanager/qt-maemo/maemodeployable.h → src/plugins/remotelinux/maemodeployable.h
View File

@@ -36,7 +36,7 @@
#include <QtCore/QHash>
#include <QtCore/QString>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeployable
@@ -62,7 +62,7 @@ inline uint qHash(const MaemoDeployable &d)
return qHash(qMakePair(d.localFilePath, d.remoteDir));
}
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMODEPLOYABLE_H

7
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp → src/plugins/remotelinux/maemodeployablelistmodel.cpp
View File

@@ -39,6 +39,7 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4target.h>
#include <qtsupport/baseqtversion.h>
@@ -51,7 +52,9 @@
#include <QtGui/QImageReader>
#include <QtGui/QMainWindow>
namespace Qt4ProjectManager {
using namespace Qt4ProjectManager;
namespace RemoteLinux {
namespace Internal {
MaemoDeployableListModel::MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
@@ -360,5 +363,5 @@ QString MaemoDeployableListModel::remoteIconDir() const
.arg(MaemoGlobal::applicationIconSize(MaemoGlobal::version(qv->qmakeCommand())));
}
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
} // namespace Internal

18
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h → src/plugins/remotelinux/maemodeployablelistmodel.h
View File

@@ -47,7 +47,7 @@ namespace QtSupport {
class BaseQtVersion;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeployableListModel : public QAbstractTableModel
@@ -58,7 +58,7 @@ public:
UpdateProFile, DontUpdateProFile, AskToUpdateProFile
};
MaemoDeployableListModel(const Qt4ProFileNode *proFileNode,
MaemoDeployableListModel(const Qt4ProjectManager::Qt4ProFileNode *proFileNode,
ProFileUpdateSetting updateSetting, QObject *parent);
~MaemoDeployableListModel();
@@ -73,8 +73,8 @@ public:
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(); }
@@ -107,12 +107,12 @@ private:
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;
@@ -120,7 +120,7 @@ private:
bool m_hasTargetPath;
};
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
} // namespace Internal
#endif // MAEMOPACKAGECONTENTS_H

13
src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp → src/plugins/remotelinux/maemodeployables.cpp
View File

@@ -35,14 +35,15 @@
#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)
@@ -59,7 +60,7 @@ MaemoDeployables::~MaemoDeployables() {}
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
@@ -77,7 +78,7 @@ void MaemoDeployables::createModels()
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);
@@ -109,7 +110,7 @@ void MaemoDeployables::createModels()
endResetModel();
connect(m_target->qt4Project(),
SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool)),
m_updateTimer, SLOT(start()));
}
@@ -216,5 +217,5 @@ QVariant MaemoDeployables::data(const QModelIndex &index, int role) const
return QVariant();
}
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
} // namespace Internal

14
src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h → src/plugins/remotelinux/maemodeployables.h
View File

@@ -44,15 +44,17 @@ QT_FORWARD_DECLARE_CLASS(QTimer)
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
class Qt4BaseTarget;
namespace Internal {
class Qt4ProFileNode;
} // namespace Qt4ProjectManager
namespace RemoteLinux {
namespace Internal {
class MaemoDeployables : public QAbstractListModel
{
Q_OBJECT
public:
MaemoDeployables(const Qt4BaseTarget *target);
MaemoDeployables(const Qt4ProjectManager::Qt4BaseTarget *target);
~MaemoDeployables();
void setUnmodified();
bool isModified() const;
@@ -70,15 +72,15 @@ private:
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

5
src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp → src/plugins/remotelinux/maemodeploybymountstep.cpp
View File

@@ -48,8 +48,9 @@
#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,
@@ -389,4 +390,4 @@ const QString MaemoMountAndCopyDeployStep::DisplayName
= tr("Deploy files via UTFS mount");
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.h → src/plugins/remotelinux/maemodeploybymountstep.h
View File

@@ -38,7 +38,7 @@
#include "maemodeployable.h"
#include "maemomountspecification.h"
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageInstaller;
class MaemoDeploymentMounter;
@@ -139,6 +139,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEPLOYBYMOUNTSTEP_H

4
src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.cpp → src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
View File

@@ -45,7 +45,7 @@
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent)
@@ -168,4 +168,4 @@ void MaemoDeployConfigurationWidget::addIcon()
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.h → src/plugins/remotelinux/maemodeployconfigurationwidget.h
View File

@@ -41,7 +41,7 @@ namespace Ui {
}
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class Qt4MaemoDeployConfiguration;
@@ -67,6 +67,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEPLOYCONFIGURATIONWIDGET_H

0
src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.ui → src/plugins/remotelinux/maemodeployconfigurationwidget.ui
View File

5
src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.cpp → src/plugins/remotelinux/maemodeploymentmounter.cpp
View File

@@ -41,9 +41,10 @@
#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)
@@ -203,4 +204,4 @@ void MaemoDeploymentMounter::setState(State newState)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

10
src/plugins/qt4projectmanager/qt-maemo/maemodeploymentmounter.h → src/plugins/remotelinux/maemodeploymentmounter.h
View File

@@ -41,9 +41,9 @@
#include <QtCore/QSharedPointer>
namespace Utils { class SshConnection; }
namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoRemoteMounter;
@@ -59,7 +59,7 @@ public:
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:
@@ -94,10 +94,10 @@ private:
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

4
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h → src/plugins/remotelinux/maemodeploystep.h
View File

@@ -53,7 +53,7 @@ namespace Utils {
class SshConnection;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
class Qt4BuildConfiguration;
namespace Internal {
class AbstractMaemoPackageCreationStep;
@@ -177,6 +177,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEP_H

5
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp → src/plugins/remotelinux/maemodeploystepfactory.cpp
View File

@@ -44,13 +44,12 @@
#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"));
@@ -209,4 +208,4 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

6
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.h → src/plugins/remotelinux/maemodeploystepfactory.h
View File

@@ -35,13 +35,13 @@
#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;
@@ -64,6 +64,6 @@ public:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEPFACTORY_H

10
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp → src/plugins/remotelinux/maemodeploystepwidget.cpp
View File

@@ -37,7 +37,6 @@
#include "maemodeviceconfigurations.h"
#include "maemosettingspages.h"
#include "maemoglobal.h"
#include "maemomanager.h"
#include "maemopertargetdeviceconfigurationlistmodel.h"
#include "maemorunconfiguration.h"
#include "qt4maemodeployconfiguration.h"
@@ -50,7 +49,7 @@
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoDeployStepBaseWidget::MaemoDeployStepBaseWidget(AbstractLinuxDeviceDeployStep *step) :
@@ -127,9 +126,8 @@ void MaemoDeployStepBaseWidget::setCurrentDeviceConfig(int index)
void MaemoDeployStepBaseWidget::showDeviceConfigurations()
{
MaemoDeviceConfigurationsSettingsPage *page
= MaemoManager::instance().deviceConfigurationsSettingsPage();
Core::ICore::instance()->showOptionsDialog(page->category(), page->id());
Core::ICore::instance()->showOptionsDialog(MaemoDeviceConfigurationsSettingsPage::Category,
MaemoDeviceConfigurationsSettingsPage::Id);
}
@@ -141,4 +139,4 @@ MaemoDeployStepWidget::MaemoDeployStepWidget(AbstractMaemoDeployStep *step)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h → src/plugins/remotelinux/maemodeploystepwidget.h
View File

@@ -41,7 +41,7 @@ namespace Ui {
}
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class AbstractLinuxDeviceDeployStep;
class AbstractMaemoDeployStep;
@@ -85,6 +85,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEPLOYSTEPWIDGET_H

0
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui → src/plugins/remotelinux/maemodeploystepwidget.ui
View File

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp → src/plugins/remotelinux/maemodeviceconfigurations.cpp
View File

@@ -45,7 +45,7 @@
typedef Utils::SshConnectionParameters::AuthenticationType AuthType;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
namespace {
@@ -687,4 +687,4 @@ QVariant MaemoDeviceConfigurations::data(const QModelIndex &index, int role) con
MaemoDeviceConfigurations *MaemoDeviceConfigurations::m_instance = 0;
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.h → src/plugins/remotelinux/maemodeviceconfigurations.h
View File

@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoPortList
@@ -189,6 +189,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGURATIONS_H

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp → src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
View File

@@ -58,7 +58,7 @@
using namespace Core;
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
namespace {
const QLatin1String LastDeviceConfigIndexKey("LastDisplayedMaemoDeviceConfig");
@@ -451,4 +451,4 @@ void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.h → src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
View File

@@ -47,7 +47,7 @@ namespace Utils {
class SshRemoteProcessRunner;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class NameValidator;
@@ -113,6 +113,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui → src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui
View File

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp → src/plugins/remotelinux/maemodeviceconfigwizard.cpp
View File

@@ -53,7 +53,7 @@
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
namespace {
@@ -722,6 +722,6 @@ int MaemoDeviceConfigWizard::nextId() const
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#include "maemodeviceconfigwizard.moc"

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.h → src/plugins/remotelinux/maemodeviceconfigwizard.h
View File

@@ -35,7 +35,7 @@
#include <QtCore/QScopedPointer>
#include <QtGui/QWizard>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
class MaemoDeviceConfigurations;
@@ -56,6 +56,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGWIZARD_H

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeycreationpage.ui → src/plugins/remotelinux/maemodeviceconfigwizardkeycreationpage.ui
View File

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardkeydeploymentpage.ui → src/plugins/remotelinux/maemodeviceconfigwizardkeydeploymentpage.ui
View File

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardlogindatapage.ui → src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui
View File

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui → src/plugins/remotelinux/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
View File

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardreusekeyscheckpage.ui → src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
View File

0
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizardstartpage.ui → src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui
View File

2
src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp → src/plugins/remotelinux/maemodeviceenvreader.cpp
View File

@@ -37,7 +37,7 @@
#include <utils/ssh/sshremoteprocessrunner.h>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, MaemoRunConfiguration *config)

2
src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h → src/plugins/remotelinux/maemodeviceenvreader.h
View File

@@ -41,7 +41,7 @@ namespace Utils {
class SshRemoteProcessRunner;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;

4
src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.cpp → src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
View File

@@ -48,7 +48,7 @@
using namespace ProjectExplorer;
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoDirectDeviceUploadStep::MaemoDirectDeviceUploadStep(BuildStepList *parent)
@@ -246,4 +246,4 @@ const QString MaemoDirectDeviceUploadStep::DisplayName
= tr("Upload files via SFTP");
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemodirectdeviceuploadstep.h → src/plugins/remotelinux/maemodirectdeviceuploadstep.h
View File

@@ -45,7 +45,7 @@ class SshRemoteProcess;
class SftpChannel;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeployable;
@@ -89,6 +89,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMODIRECTDEVICEUPLOADSTEP_H

13
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp → src/plugins/remotelinux/maemoglobal.cpp
View File

@@ -50,7 +50,10 @@
#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);
@@ -64,17 +67,17 @@ bool MaemoGlobal::isMaemoTargetId(const QString &id)
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)
@@ -451,4 +454,4 @@ MaemoGlobal::PackagingSystem MaemoGlobal::packagingSystem(MaemoDeviceConfig::OsV
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

11
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h → src/plugins/remotelinux/maemoglobal.h
View File

@@ -55,11 +55,10 @@ class QProcess;
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
@@ -90,7 +89,7 @@ private:
class MaemoGlobal
{
Q_DECLARE_TR_FUNCTIONS(Qt4ProjectManager::Internal::MaemoGlobal)
Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::MaemoGlobal)
public:
enum PackagingSystem { Dpkg, Rpm, Tar };
@@ -187,6 +186,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOGLOBAL_H

5
src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp → src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
View File

@@ -47,8 +47,9 @@
#include <QtCore/QWeakPointer>
using namespace ProjectExplorer;
using namespace Qt4ProjectManager;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class AbstractMaemoInstallPackageToSysrootWidget : public BuildStepConfigWidget
@@ -399,6 +400,6 @@ const QString MaemoMakeInstallToSysrootStep::DisplayName
= tr("Copy files to sysroot");
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#include "maemoinstalltosysrootstep.moc"

4
src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.h → src/plugins/remotelinux/maemoinstalltosysrootstep.h
View File

@@ -40,7 +40,7 @@
QT_FORWARD_DECLARE_CLASS(QProcess)
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class AbstractMaemoInstallPackageToSysrootStep : public ProjectExplorer::BuildStep
@@ -131,6 +131,6 @@ public:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOINSTALLTOSYSROOTSTEP_H

4
src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.cpp → src/plugins/remotelinux/maemokeydeployer.cpp
View File

@@ -38,7 +38,7 @@
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoKeyDeployer::MaemoKeyDeployer(QObject *parent)
@@ -115,4 +115,4 @@ void MaemoKeyDeployer::cleanup()
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemokeydeployer.h → src/plugins/remotelinux/maemokeydeployer.h
View File

@@ -40,7 +40,7 @@ struct SshConnectionParameters;
class SshRemoteProcessRunner;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoKeyDeployer : public QObject
@@ -69,6 +69,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOKEYDEPLOYER_H

4
src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.cpp → src/plugins/remotelinux/maemomountspecification.cpp
View File

@@ -32,7 +32,7 @@
#include "maemomountspecification.h"
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
const QLatin1String MaemoMountSpecification::InvalidMountPoint("/");
@@ -44,5 +44,5 @@ MaemoMountSpecification::MaemoMountSpecification(const QString &localDir,
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemomountspecification.h → src/plugins/remotelinux/maemomountspecification.h
View File

@@ -35,7 +35,7 @@
#include <QtCore/QLatin1String>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
struct MaemoMountSpecification {
@@ -49,6 +49,6 @@ struct MaemoMountSpecification {
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOMOUNTSPECIFICATION_H

11
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp → src/plugins/remotelinux/maemopackagecreationfactory.cpp
View File

@@ -41,14 +41,13 @@
#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");
@@ -81,13 +80,13 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
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();
@@ -170,4 +169,4 @@ BuildStep *MaemoPackageCreationFactory::clone(ProjectExplorer::BuildStepList *pa
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

6
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.h → src/plugins/remotelinux/maemopackagecreationfactory.h
View File

@@ -34,13 +34,13 @@
#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;
@@ -63,6 +63,6 @@ public:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONFACTORY_H

11
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp → src/plugins/remotelinux/maemopackagecreationstep.cpp
View File

@@ -40,9 +40,9 @@
#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>
@@ -60,8 +60,9 @@ using namespace ProjectExplorer::Constants;
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");
@@ -826,6 +827,6 @@ const QString MaemoTarPackageCreationStep::CreatePackageId
= QLatin1String("MaemoTarPackageCreationStep");
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#include "maemopackagecreationstep.moc"

17
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h → src/plugins/remotelinux/maemopackagecreationstep.h
View File

@@ -41,9 +41,9 @@ class QFileInfo;
class QProcess;
QT_END_NAMESPACE
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
namespace RemoteLinux {
namespace Internal {
class MaemoDeployableListModel;
class AbstractQt4MaemoTarget;
@@ -63,10 +63,11 @@ public:
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;
@@ -106,7 +107,7 @@ private:
static QString nativePath(const QFile &file);
bool packagingNeeded() const;
const Qt4BuildConfiguration *m_lastBuildConfig;
const Qt4ProjectManager::Qt4BuildConfiguration *m_lastBuildConfig;
};
@@ -127,7 +128,7 @@ private:
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();
@@ -151,7 +152,7 @@ private:
MaemoRpmPackageCreationStep *other);
void ctor();
static QString rpmBuildDir(const Qt4BuildConfiguration *bc);
static QString rpmBuildDir(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
static const QString CreatePackageId;
};
@@ -182,6 +183,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONSTEP_H

4
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp → src/plugins/remotelinux/maemopackagecreationwidget.cpp
View File

@@ -49,7 +49,7 @@
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
// TODO: Split up into dedicated widgets for Debian and RPM steps.
@@ -271,4 +271,4 @@ void MaemoPackageCreationWidget::editFile(const QString &filePath)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.h → src/plugins/remotelinux/maemopackagecreationwidget.h
View File

@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
namespace Ui { class MaemoPackageCreationWidget; }
QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class AbstractMaemoPackageCreationStep;
@@ -79,6 +79,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOPACKAGECREATIONWIDGET_H

0
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui → src/plugins/remotelinux/maemopackagecreationwidget.ui
View File

4
src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp → src/plugins/remotelinux/maemopackageinstaller.cpp
View File

@@ -39,7 +39,7 @@
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
AbstractMaemoPackageInstaller::AbstractMaemoPackageInstaller(QObject *parent)
@@ -213,4 +213,4 @@ QStringList MaemoTarPackageInstaller::installCommandArguments() const
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h → src/plugins/remotelinux/maemopackageinstaller.h
View File

@@ -43,7 +43,7 @@ class SshRemoteProcessRunner;
#include <QtCore/QString>
#include <QtCore/QStringList>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoDeviceConfig;
@@ -130,6 +130,6 @@ private:
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // ABSTRACTMAEMOPACKAGEINSTALLER_H

4
src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.cpp → src/plugins/remotelinux/maemopackageuploader.cpp
View File

@@ -41,7 +41,7 @@
using namespace Utils;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoPackageUploader::MaemoPackageUploader(QObject *parent) :
@@ -156,4 +156,4 @@ void MaemoPackageUploader::setState(State newState)
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemopackageuploader.h → src/plugins/remotelinux/maemopackageuploader.h
View File

@@ -44,7 +44,7 @@ class SftpChannel;
class SshConnection;
}
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoPackageUploader : public QObject
@@ -83,6 +83,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOPACKAGEUPLOADER_H

4
src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.cpp → src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
View File

@@ -35,7 +35,7 @@
using namespace ProjectExplorer;
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoPerTargetDeviceConfigurationListModel::MaemoPerTargetDeviceConfigurationListModel(QObject *parent,
@@ -132,4 +132,4 @@ int MaemoPerTargetDeviceConfigurationListModel::indexForInternalId(MaemoDeviceCo
}
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux

4
src/plugins/qt4projectmanager/qt-maemo/maemopertargetdeviceconfigurationlistmodel.h → src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
View File

@@ -40,7 +40,7 @@
namespace ProjectExplorer { class Target; }
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
class MaemoPerTargetDeviceConfigurationListModel : public QAbstractListModel
@@ -68,6 +68,6 @@ private:
};
} // namespace Internal
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
#endif // MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H

4
src/plugins/qt4projectmanager/qt-maemo/maemoprofilesupdatedialog.cpp → src/plugins/remotelinux/maemoprofilesupdatedialog.cpp
View File

@@ -39,7 +39,7 @@
#include <QtCore/QDir>
#include <QtGui/QTableWidgetItem>
namespace Qt4ProjectManager {
namespace RemoteLinux {
namespace Internal {
MaemoProFilesUpdateDialog::MaemoProFilesUpdateDialog(const QList<MaemoDeployableListModel *> &models,
@@ -99,5 +99,5 @@ MaemoProFilesUpdateDialog::getUpdateSettings() const
return settings;
}
} // namespace Qt4ProjectManager
} // namespace RemoteLinux
} // namespace Internal

Some files were not shown because too many files have changed in this diff Show More