From 165f2f893807857caf63fe0c1b83ed58288d7139 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 29 Jul 2019 09:09:48 +0200 Subject: Qmake: Replace QmakeBC::emitQmakeBuildConfigurationChanged ... by direct emission of the signal. Signals are public nowadays, so the indirection is not needed anymore. Change-Id: I82328a8fa05458e0478a52157863b7265f0a42ad Reviewed-by: Christian Kandeler --- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp | 5 ----- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h | 6 ------ src/plugins/qmakeprojectmanager/qmakestep.cpp | 10 +++++----- 3 files changed, 5 insertions(+), 16 deletions(-) (limited to 'src/plugins/qmakeprojectmanager') diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 713b9a6c07..c041048be2 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -311,11 +311,6 @@ bool QmakeBuildConfiguration::isBuildDirAtSafeLocation() const buildDirectory().toString()); } -void QmakeBuildConfiguration::emitQMakeBuildConfigurationChanged() -{ - emit qmakeBuildConfigurationChanged(); -} - QStringList QmakeBuildConfiguration::configCommandLineArguments() const { QStringList result; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index cc63a56713..1b23b5e572 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -63,12 +63,6 @@ public: static QString shadowBuildDirectory(const Utils::FilePath &profilePath, const ProjectExplorer::Kit *k, const QString &suffix, BuildConfiguration::BuildType type); - /// \internal for qmakestep - // used by qmake step to notify that the qmake args have changed - // not really nice, the build configuration should save the arguments - // since they are needed for reevaluation - void emitQMakeBuildConfigurationChanged(); - QStringList configCommandLineArguments() const; // Those functions are used in a few places. diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 6aff639a64..29ec985e2b 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -360,7 +360,7 @@ void QMakeStep::setUserArguments(const QString &arguments) emit userArgumentsChanged(); - qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); + emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); } @@ -374,7 +374,7 @@ void QMakeStep::setExtraArguments(const QStringList &args) if (m_extraArgs != args) { m_extraArgs = args; emit extraArgumentsChanged(); - qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); + emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); } } @@ -403,7 +403,7 @@ void QMakeStep::setLinkQmlDebuggingLibrary(bool enable) emit linkQmlDebuggingLibraryChanged(); - qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); + emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); } @@ -421,7 +421,7 @@ void QMakeStep::setUseQtQuickCompiler(bool enable) emit useQtQuickCompilerChanged(); - qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); + emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); } @@ -438,7 +438,7 @@ void QMakeStep::setSeparateDebugInfo(bool enable) emit separateDebugInfoChanged(); - qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); + emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); } -- cgit v1.2.1