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

QmakeProject: Remove proFilesEvaluated() signal

Browse Source 
It's not really different from Project::parsingFinished.

Adapt users.

Change-Id: I47d23469df2ec52c5d823508772a7e8b8ad429ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-12-20 17:01:14 +01:00
parent a8ddaafca4
commit 6bb7da79de
6 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.cpp
View File

@@ -64,13 +64,10 @@ AndroidQmakeBuildConfiguration::AndroidQmakeBuildConfiguration(Target *target)
{ {
updateCacheAndEmitEnvironmentChanged(); updateCacheAndEmitEnvironmentChanged();
auto updateGrade = [this] { AndroidManager::updateGradleProperties(BuildConfiguration::target()); }; auto updateGradle = [this] { AndroidManager::updateGradleProperties(BuildConfiguration::target()); };
auto project = qobject_cast<QmakeProject *>(target->project()); connect(target->project(), &Project::parsingFinished, this, updateGradle);
if (project) connect(this, &AndroidQmakeBuildConfiguration::enabledChanged, this, updateGradle);
connect(project, &QmakeProject::proFilesEvaluated, this, updateGrade);
else
connect(this, &AndroidQmakeBuildConfiguration::enabledChanged, this, updateGrade);
} }
void AndroidQmakeBuildConfiguration::initialize(const BuildInfo *info) void AndroidQmakeBuildConfiguration::initialize(const BuildInfo *info)

12
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
View File

@@ -82,11 +82,8 @@ DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *target)
addExtraAspect(new TerminalAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UseTerminal")); addExtraAspect(new TerminalAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UseTerminal"));
addExtraAspect(new WorkingDirectoryAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory")); addExtraAspect(new WorkingDirectoryAspect(this, "Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"));
QmakeProject *project = qmakeProject(); connect(target->project(), &Project::parsingFinished,
connect(project, &Project::parsingFinished,
this, &DesktopQmakeRunConfiguration::updateTargetInformation); this, &DesktopQmakeRunConfiguration::updateTargetInformation);
connect(project, &QmakeProject::proFilesEvaluated,
this, &DesktopQmakeRunConfiguration::proFileEvaluated);
} }
QString DesktopQmakeRunConfiguration::extraId() const QString DesktopQmakeRunConfiguration::extraId() const
@@ -94,13 +91,6 @@ QString DesktopQmakeRunConfiguration::extraId() const
return m_proFilePath.toString(); 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<LocalEnvironmentAspect>()->buildEnvironmentHasChanged();
}
void DesktopQmakeRunConfiguration::updateTargetInformation() void DesktopQmakeRunConfiguration::updateTargetInformation()
{ {
setDefaultDisplayName(defaultDisplayName()); setDefaultDisplayName(defaultDisplayName());

1
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
View File

@@ -90,7 +90,6 @@ protected:
QString extraId() const override; QString extraId() const override;
private: private:
void proFileEvaluated();
void updateTargetInformation(); void updateTargetInformation();
QPair<QString, QString> extractWorkingDirAndExecutable(const QmakeProFile *proFile) const; QPair<QString, QString> extractWorkingDirAndExecutable(const QmakeProFile *proFile) const;

1
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -545,7 +545,6 @@ void QmakeProject::decrementPendingEvaluateFutures()
if (activeTarget()) if (activeTarget())
activeTarget()->updateDefaultDeployConfigurations(); activeTarget()->updateDefaultDeployConfigurations();
updateRunConfigurations(); updateRunConfigurations();
emit proFilesEvaluated();
emitParsingFinished(true); // Qmake always returns (some) data, even when it failed:-) emitParsingFinished(true); // Qmake always returns (some) data, even when it failed:-)
} }
} }

1
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -129,7 +129,6 @@ public:
signals: signals:
void proFileUpdated(QmakeProjectManager::QmakeProFile *pro, bool, bool); void proFileUpdated(QmakeProjectManager::QmakeProFile *pro, bool, bool);
void buildDirectoryInitialized(); void buildDirectoryInitialized();
void proFilesEvaluated();
public: public:
void scheduleAsyncUpdate(QmakeProFile::AsyncUpdateDelay delay = QmakeProFile::ParseLater); void scheduleAsyncUpdate(QmakeProFile::AsyncUpdateDelay delay = QmakeProFile::ParseLater);

2
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
View File

@@ -109,7 +109,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
}); });
connect(project, &QmakeProject::buildDirectoryInitialized, connect(project, &QmakeProject::buildDirectoryInitialized,
this, &QmakeProjectConfigWidget::updateProblemLabel); this, &QmakeProjectConfigWidget::updateProblemLabel);
connect(project, &QmakeProject::proFilesEvaluated, connect(project, &Project::parsingFinished,
this, &QmakeProjectConfigWidget::updateProblemLabel); this, &QmakeProjectConfigWidget::updateProblemLabel);
connect(bc->target(), &Target::kitChanged, this, &QmakeProjectConfigWidget::updateProblemLabel); connect(bc->target(), &Target::kitChanged, this, &QmakeProjectConfigWidget::updateProblemLabel);