Commit fa0be746 authored by dt's avatar dt
Browse files

Make Maemo compile again.

Conflicts:

	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
parent 72fe54db
......@@ -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<MaemoRunConfiguration> 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<MaemoRunConfiguration *>(runConfig);
MaemoRunConfiguration *rc = qobject_cast<MaemoRunConfiguration *>(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<Qt4Project *>(runConfig->project());
QTC_ASSERT(runConfig, return false);
Qt4Project *qt4Project = qobject_cast<Qt4Project *>(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"
......@@ -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);
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment