summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-29 09:09:48 +0200
committerhjk <hjk@qt.io>2019-07-29 11:32:09 +0000
commit165f2f893807857caf63fe0c1b83ed58288d7139 (patch)
tree39bf852da373321ff3a2927910864527e1621722 /src/plugins/qmakeprojectmanager
parent0d113dccd3e9bb0910448e8c76e4673e38ab3cb2 (diff)
downloadqt-creator-165f2f893807857caf63fe0c1b83ed58288d7139.tar.gz
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 <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp5
-rw-r--r--src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h6
-rw-r--r--src/plugins/qmakeprojectmanager/qmakestep.cpp10
3 files changed, 5 insertions, 16 deletions
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();
}