Commit 64ba06e2 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Create dedicated plugin.

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: default avatarDaniel Teske <daniel.teske@nokia.com>
parent fce95689
......@@ -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
......
......@@ -36,9 +36,8 @@
#include <projectexplorer/nodesvisitor.h>
namespace Qt4ProjectManager {
namespace Internal {
class Qt4ProFileNode;
namespace Internal {
class FindQt4ProFiles: protected ProjectExplorer::NodesVisitor {
......
......@@ -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
......
......@@ -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());
}
////
......
......@@ -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;
......
......@@ -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*)));
}
//////
......
......@@ -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);
......
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
......@@ -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*)));
......
......@@ -46,10 +46,10 @@ class BaseQtVersion;
}
namespace Qt4ProjectManager {
class Qt4ProFileNode;
namespace Internal {
class Qt4SymbianTarget;
class Qt4ProFileNode;
class S60DeployConfigurationFactory;
class S60DeviceRunConfiguration;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
}
......
......@@ -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