From fa0be746a988f35ea1f797bd208acd357f76cc04 Mon Sep 17 00:00:00 2001 From: dt Date: Wed, 18 Nov 2009 17:36:17 +0100 Subject: [PATCH] Make Maemo compile again. Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h --- .../qt-maemo/maemorunconfiguration.cpp | 21 ++++++++----------- .../qt-maemo/maemorunconfiguration.h | 1 + .../qt-s60/s60devicerunconfiguration.cpp | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index 06f17b2ffe9..c5332fde16e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -59,8 +59,8 @@ using namespace ProjectExplorer; -namespace Qt4ProjectManager { -namespace Internal { +using namespace Qt4ProjectManager; +using namespace Qt4ProjectManager::Internal; class MaemoRunConfigurationWidget : public QWidget { @@ -134,7 +134,7 @@ private slots: protected: ErrorDumper dumper; - const QSharedPointer runConfig; + MaemoRunConfiguration *runConfig; // TODO this pointer can be invalid private: QProcess deployProcess; @@ -679,7 +679,7 @@ void MaemoRunConfiguration::updateTarget() // Find out what flags we pass on to qmake, this code is duplicated in // the qmake step - QtVersion::QmakeBuildConfig defaultBuildConfiguration = + QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion->defaultBuildConfig(); QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(qt4Project->activeBuildConfiguration() @@ -857,7 +857,6 @@ void MaemoRunConfiguration::enabledStateChanged() // #pragma mark -- MaemoRunConfigurationWidget - MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( MaemoRunConfiguration *runConfiguration, QWidget *parent) : QWidget(parent) @@ -865,6 +864,7 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget( { QFormLayout *mainLayout = new QFormLayout; setLayout(mainLayout); + mainLayout->setFormAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_configNameLineEdit = new QLineEdit(m_runConfiguration->name()); mainLayout->addRow(tr("Run configuration name:"), m_configNameLineEdit); @@ -1186,7 +1186,7 @@ bool MaemoRunControlFactory::canRun(RunConfiguration *runConfiguration, RunControl* MaemoRunControlFactory::create(RunConfiguration *runConfig, const QString &mode) { - MaemoRunConfiguration* rc = qobject_cast(runConfig); + MaemoRunConfiguration *rc = qobject_cast(runConfig); Q_ASSERT(rc); Q_ASSERT(mode == ProjectExplorer::Constants::RUNMODE || mode == ProjectExplorer::Constants::DEBUGMODE); @@ -1228,7 +1228,7 @@ AbstractMaemoRunControl::AbstractMaemoRunControl(RunConfiguration *rc) void AbstractMaemoRunControl::startDeployment(bool forDebugging) { - QTC_ASSERT(!runConfig.isNull(), return); + QTC_ASSERT(runConfig, return); QStringList deployables; if (runConfig->currentlyNeedsDeployment()) { deployingExecutable = true; @@ -1317,9 +1317,9 @@ const QString AbstractMaemoRunControl::targetCmdLinePrefix() const bool AbstractMaemoRunControl::setProcessEnvironment(QProcess &process) { - QTC_ASSERT(!runConfig.isNull(), return false); - Qt4Project *qt4Project = qobject_cast(runConfig->project()); QTC_ASSERT(runConfig, return false); + Qt4Project *qt4Project = qobject_cast(runConfig->project()); + QTC_ASSERT(qt4Project, return false); Environment env = Environment::systemEnvironment(); qt4Project->toolChain(qt4Project->activeBuildConfiguration()) ->addToEnvironment(env); @@ -1599,7 +1599,4 @@ void MaemoDebugRunControl::debuggerOutput(const QString &output) emit addToOutputWindowInline(this, output); } -} // namespace Internal -} // namespace Qt4ProjectManager - #include "maemorunconfiguration.moc" diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h index 55c494c923d..fff60d6643f 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h @@ -199,6 +199,7 @@ public: QString displayNameForType(const QString &type) const; RunConfiguration *create(Project *project, const QString &type); + private slots: void addedRunConfiguration(ProjectExplorer::Project* project); void removedRunConfiguration(ProjectExplorer::Project* project); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 616bd86be41..58e4b625a29 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -273,8 +273,8 @@ void S60DeviceRunConfiguration::updateTarget() // Find out what flags we pass on to qmake, this code is duplicated in the qmake step QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion->defaultBuildConfig(); - QtVersion::QmakeBuildConfigs projectBuildConfiguration = pro->activeBuildConfiguration() - ->value("buildConfiguration").toInt(); + QtVersion::QmakeBuildConfigs projectBuildConfiguration = + QtVersion::QmakeBuildConfigs(pro->activeBuildConfiguration()->value("buildConfiguration").toInt()); QStringList addedUserConfigArguments; QStringList removedUserConfigArguments; if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))