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

Fix signal names and also ensure that we don't reset the cursor position

Browse Source
This commit is contained in:
dt
2009-11-30 16:34:30 +01:00
parent 527a9bd526
commit 16fcb82d08
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,10 +216,10 @@ bool QMakeStep::processFinished(int exitCode, QProcess::ExitStatus status)
return result; return result;
} }
void QMakeStep::setQMakeArguments(const QStringList &arguments) void QMakeStep::setUserArguments(const QStringList &arguments)
{ {
m_userArgs = arguments; m_userArgs = arguments;
emit changed(); emit userArgumentsChanged();
} }
QStringList QMakeStep::userArguments() QStringList QMakeStep::userArguments()
@@ -240,14 +240,14 @@ void QMakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
} }
QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
: BuildStepConfigWidget(), m_step(step) : BuildStepConfigWidget(), m_step(step), m_ignoreChange(false)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
connect(m_ui.qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)), connect(m_ui.qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
this, SLOT(qmakeArgumentsLineEditTextEdited())); this, SLOT(qmakeArgumentsLineEditTextEdited()));
connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationChanged())); connect(m_ui.buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationChanged()));
connect(step, SIGNAL(changed()), connect(step, SIGNAL(userArgumentsChanged()),
this, SLOT(update())); this, SLOT(userArgumentsChanged()));
connect(step->buildConfiguration(), SIGNAL(qtVersionChanged()), connect(step->buildConfiguration(), SIGNAL(qtVersionChanged()),
this, SLOT(qtVersionChanged())); this, SLOT(qtVersionChanged()));
} }
@@ -289,8 +289,10 @@ void QMakeStepConfigWidget::updateTitleLabel()
void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited() void QMakeStepConfigWidget::qmakeArgumentsLineEditTextEdited()
{ {
m_step->setQMakeArguments( m_ignoreChange = true;
m_step->setUserArguments(
ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text())); ProjectExplorer::Environment::parseCombinedArgString(m_ui.qmakeAdditonalArgumentsLineEdit->text()));
m_ignoreChange = false;
m_step->qt4BuildConfiguration()->qt4Project()->invalidateCachedTargetInformation(); m_step->qt4BuildConfiguration()->qt4Project()->invalidateCachedTargetInformation();
updateTitleLabel(); updateTitleLabel();
@@ -321,9 +323,12 @@ QString QMakeStepConfigWidget::displayName() const
return m_step->displayName(); return m_step->displayName();
} }
void QMakeStepConfigWidget::update() void QMakeStepConfigWidget::userArgumentsChanged()
{ {
init(); if (m_ignoreChange)
return;
QString qmakeArgs = ProjectExplorer::Environment::joinArgumentList(m_step->userArguments());
m_ui.qmakeAdditonalArgumentsLineEdit->setText(qmakeArgs);
} }
void QMakeStepConfigWidget::init() void QMakeStepConfigWidget::init()

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

@@ -83,13 +83,13 @@ public:
QStringList allArguments(); QStringList allArguments();
QStringList userArguments(); QStringList userArguments();
void setQMakeArguments(const QStringList &arguments); void setUserArguments(const QStringList &arguments);
virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map); virtual void restoreFromLocalMap(const QMap<QString, QVariant> &map);
virtual void storeIntoLocalMap(QMap<QString, QVariant> &map); virtual void storeIntoLocalMap(QMap<QString, QVariant> &map);
signals: signals:
void changed(); void userArgumentsChanged();
protected: protected:
virtual void processStartupFailed(); virtual void processStartupFailed();
@@ -115,7 +115,7 @@ public:
private slots: private slots:
void qmakeArgumentsLineEditTextEdited(); void qmakeArgumentsLineEditTextEdited();
void buildConfigurationChanged(); void buildConfigurationChanged();
void update(); void userArgumentsChanged();
void qtVersionChanged(); void qtVersionChanged();
private: private:
void updateTitleLabel(); void updateTitleLabel();
@@ -123,6 +123,7 @@ private:
Ui::QMakeStep m_ui; Ui::QMakeStep m_ui;
QMakeStep *m_step; QMakeStep *m_step;
QString m_summaryText; QString m_summaryText;
bool m_ignoreChange;
}; };
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager

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

@@ -476,7 +476,7 @@ Qt4BuildConfiguration *Qt4Project::addQt4BuildConfiguration(QString displayName,
cleanStep->setClean(true); cleanStep->setClean(true);
bc->insertCleanStep(0, cleanStep); bc->insertCleanStep(0, cleanStep);
if (!additionalArguments.isEmpty()) if (!additionalArguments.isEmpty())
qmakeStep->setQMakeArguments(additionalArguments); qmakeStep->setUserArguments(additionalArguments);
// set some options for qmake and make // set some options for qmake and make
if (qmakeBuildConfiguration & QtVersion::BuildAll) // debug_and_release => explicit targets if (qmakeBuildConfiguration & QtVersion::BuildAll) // debug_and_release => explicit targets

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

@@ -298,7 +298,7 @@ void Qt4ProjectConfigWidget::importLabelClicked()
// Combo box will be updated at the end // Combo box will be updated at the end
QMakeStep *qmakeStep = m_buildConfiguration->qmakeStep(); QMakeStep *qmakeStep = m_buildConfiguration->qmakeStep();
qmakeStep->setQMakeArguments(additionalArguments); qmakeStep->setUserArguments(additionalArguments);
MakeStep *makeStep = m_buildConfiguration->makeStep(); MakeStep *makeStep = m_buildConfiguration->makeStep();
m_buildConfiguration->setValue("buildConfiguration", int(qmakeBuildConfig)); m_buildConfiguration->setValue("buildConfiguration", int(qmakeBuildConfig));