From 6bb7da79de61848d492abeac6a25b6de57b96635 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 Dec 2017 17:01:14 +0100 Subject: [PATCH] QmakeProject: Remove proFilesEvaluated() signal It's not really different from Project::parsingFinished. Adapt users. Change-Id: I47d23469df2ec52c5d823508772a7e8b8ad429ce Reviewed-by: Tobias Hunger --- .../androidqmakebuildconfigurationfactory.cpp | 9 +++------ .../desktopqmakerunconfiguration.cpp | 12 +----------- .../desktopqmakerunconfiguration.h | 1 - src/plugins/qmakeprojectmanager/qmakeproject.cpp | 1 - src/plugins/qmakeprojectmanager/qmakeproject.h | 1 - .../qmakeprojectmanager/qmakeprojectconfigwidget.cpp | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp index 040837d7393..12122b5c066 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp @@ -64,13 +64,10 @@ AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(Target *target) { updateCacheAndEmitEnvironmentChanged(); - auto updateGrade = [this] { AndroidManager::updateGradleProperties(BuildConfiguration::target()); }; + auto updateGradle = [this] { AndroidManager::updateGradleProperties(BuildConfiguration::target()); }; - auto project = qobject_cast(target->project()); - if (project) - connect(project, &QmakeProject::proFilesEvaluated, this, updateGrade); - else - connect(this, &AndroidQmakeBuildConfiguration::enabledChanged, this, updateGrade); + connect(target->project(), &Project::parsingFinished, this, updateGradle); + connect(this, &AndroidQmakeBuildConfiguration::enabledChanged, this, updateGradle); } void AndroidQmakeBuildConfiguration::initialize(const BuildInfo *info) diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 583aba9caa7..8facdac271d 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -82,11 +82,8 @@ DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *target) addExtraAspect(new TerminalAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UseTerminal")); addExtraAspect(new WorkingDirectoryAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory")); - QmakeProject *project = qmakeProject(); - connect(project, &Project::parsingFinished, + connect(target->project(), &Project::parsingFinished, this, &DesktopQmakeRunConfiguration::updateTargetInformation); - connect(project, &QmakeProject::proFilesEvaluated, - this, &DesktopQmakeRunConfiguration::proFileEvaluated); } QString DesktopQmakeRunConfiguration::extraId() const @@ -94,13 +91,6 @@ QString DesktopQmakeRunConfiguration::extraId() const return m_proFilePath.toString(); } -void DesktopQmakeRunConfiguration::proFileEvaluated() -{ - // We depend on all .pro files for the LD_LIBRARY_PATH so we emit a signal for all .pro files - // This can be optimized by checking whether LD_LIBRARY_PATH changed - return extraAspect()->buildEnvironmentHasChanged(); -} - void DesktopQmakeRunConfiguration::updateTargetInformation() { setDefaultDisplayName(defaultDisplayName()); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index 8b9d58ab051..39531a9e415 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -90,7 +90,6 @@ protected: QString extraId() const override; private: - void proFileEvaluated(); void updateTargetInformation(); QPair extractWorkingDirAndExecutable(const QmakeProFile *proFile) const; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index de142605334..bee1b5cdbfe 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -545,7 +545,6 @@ void QmakeProject::decrementPendingEvaluateFutures() if (activeTarget()) activeTarget()->updateDefaultDeployConfigurations(); updateRunConfigurations(); - emit proFilesEvaluated(); emitParsingFinished(true); // Qmake always returns (some) data, even when it failed:-) } } diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 3ead4c6b85c..51d9b78b061 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -129,7 +129,6 @@ public: signals: void proFileUpdated(QmakeProjectManager::QmakeProFile *pro, bool, bool); void buildDirectoryInitialized(); - void proFilesEvaluated(); public: void scheduleAsyncUpdate(QmakeProFile::AsyncUpdateDelay delay = QmakeProFile::ParseLater); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp index 4d62b470754..e9c04ae2bdd 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp @@ -109,7 +109,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) }); connect(project, &QmakeProject::buildDirectoryInitialized, this, &QmakeProjectConfigWidget::updateProblemLabel); - connect(project, &QmakeProject::proFilesEvaluated, + connect(project, &Project::parsingFinished, this, &QmakeProjectConfigWidget::updateProblemLabel); connect(bc->target(), &Target::kitChanged, this, &QmakeProjectConfigWidget::updateProblemLabel);