diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index c8604496972..b2c349a2b01 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -463,8 +463,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) this, SLOT(qtVersionChanged())); connect(step->qt4BuildConfiguration(), SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(qmakeBuildConfigChanged())); - connect(QtVersionManager::instance(), SIGNAL(qtVersionsUpdated(QString)), - this, SLOT(qtVersionsUpdated(QString))); + connect(QtVersionManager::instance(), SIGNAL(dumpUpdatedFor(QString)), + this, SLOT(qtVersionsDumpUpdated(QString))); } void QMakeStepConfigWidget::init() @@ -496,7 +496,7 @@ void QMakeStepConfigWidget::qtVersionChanged() updateQmlDebuggingOption(); } -void QMakeStepConfigWidget::qtVersionsUpdated(const QString &qmakeCommand) +void QMakeStepConfigWidget::qtVersionsDumpUpdated(const QString &qmakeCommand) { if (BaseQtVersion *version = m_step->qt4BuildConfiguration()->qtVersion()) { if (version->qmakeCommand() == qmakeCommand) diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 0bfa41a7401..2d41cddfbb1 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -137,7 +137,7 @@ public: private slots: // slots for handling buildconfiguration/step signals void qtVersionChanged(); - void qtVersionsUpdated(const QString &qmakeCommand); + void qtVersionsDumpUpdated(const QString &qmakeCommand); void qmakeBuildConfigChanged(); void userArgumentsChanged(); void linkQmlDebuggingLibraryChanged(); diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index 8953dbeb627..6430436b40b 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -198,8 +198,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList userChangedCurrentVersion(); updateCleanUpButton(); - connect(QtVersionManager::instance(), SIGNAL(qtVersionsUpdated(QString)), - this, SLOT(qtVersionsUpdated(QString))); + connect(QtVersionManager::instance(), SIGNAL(dumpUpdatedFor(QString)), + this, SLOT(qtVersionsDumpUpdated(QString))); } bool QtOptionsPageWidget::eventFilter(QObject *o, QEvent *e) @@ -313,7 +313,7 @@ void QtOptionsPageWidget::cleanUpQtVersions() updateCleanUpButton(); } -void QtOptionsPageWidget::qtVersionsUpdated(const QString &qmakeCommand) +void QtOptionsPageWidget::qtVersionsDumpUpdated(const QString &qmakeCommand) { foreach (BaseQtVersion *version, m_versions) { if (version->qmakeCommand() == qmakeCommand) diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h index 3512fd14f15..86a21577fe0 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.h +++ b/src/plugins/qt4projectmanager/qtoptionspage.h @@ -108,7 +108,7 @@ private slots: void debuggingHelperBuildFinished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools); void cleanUpQtVersions(); - void qtVersionsUpdated(const QString &qmakeCommand); + void qtVersionsDumpUpdated(const QString &qmakeCommand); }; class QtOptionsPage : public Core::IOptionsPage diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index f25eedc9def..18b1dc08b24 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -381,7 +381,7 @@ void QtVersionManager::updateQtVersion(int id) if (v->qmakeCommand() == qmakeCommand) v->recheckDumper(); } - emit qtVersionsUpdated(qmakeCommand); + emit dumpUpdatedFor(qmakeCommand); } void QtVersionManager::updateSettings() diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 5903e96e988..7c231044594 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -118,8 +118,8 @@ public: QString popPendingMwcUpdate(); QString popPendingGcceUpdate(); signals: - // qt version information cache has been invalidated - void qtVersionsUpdated(const QString &qmakeCommand); + // content of BaseQtVersion objects with qmake path might have changed + void dumpUpdatedFor(const QString &qmakeCommand); void qtVersionsChanged(const QList &uniqueIds); void updateExamples(QString, QString, QString);