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

Qmake: Replace QmakeBC::emitQmakeBuildConfigurationChanged

Browse Source 
... 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>
This commit is contained in:
hjk
2019-07-29 09:09:48 +02:00
parent 0d113dccd3
commit 165f2f8938
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -311,11 +311,6 @@ bool QmakeBuildConfiguration::isBuildDirAtSafeLocation() const
buildDirectory().toString()); buildDirectory().toString());
} }
void QmakeBuildConfiguration::emitQMakeBuildConfigurationChanged()
{
emit qmakeBuildConfigurationChanged();
}
QStringList QmakeBuildConfiguration::configCommandLineArguments() const QStringList QmakeBuildConfiguration::configCommandLineArguments() const
{ {
QStringList result; QStringList result;

6
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -63,12 +63,6 @@ public:
static QString shadowBuildDirectory(const Utils::FilePath &profilePath, const ProjectExplorer::Kit *k, static QString shadowBuildDirectory(const Utils::FilePath &profilePath, const ProjectExplorer::Kit *k,
const QString &suffix, BuildConfiguration::BuildType type); 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; QStringList configCommandLineArguments() const;
// Those functions are used in a few places. // Those functions are used in a few places.

10
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -360,7 +360,7 @@ void QMakeStep::setUserArguments(const QString &arguments)
emit userArgumentsChanged(); emit userArgumentsChanged();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
} }
@@ -374,7 +374,7 @@ void QMakeStep::setExtraArguments(const QStringList &args)
if (m_extraArgs != args) { if (m_extraArgs != args) {
m_extraArgs = args; m_extraArgs = args;
emit extraArgumentsChanged(); emit extraArgumentsChanged();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
} }
} }
@@ -403,7 +403,7 @@ void QMakeStep::setLinkQmlDebuggingLibrary(bool enable)
emit linkQmlDebuggingLibraryChanged(); emit linkQmlDebuggingLibraryChanged();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
} }
@@ -421,7 +421,7 @@ void QMakeStep::setUseQtQuickCompiler(bool enable)
emit useQtQuickCompilerChanged(); emit useQtQuickCompilerChanged();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
} }
@@ -438,7 +438,7 @@ void QMakeStep::setSeparateDebugInfo(bool enable)
emit separateDebugInfoChanged(); emit separateDebugInfoChanged();
qmakeBuildConfiguration()->emitQMakeBuildConfigurationChanged(); emit qmakeBuildConfiguration()->qmakeBuildConfigurationChanged();
qmakeBuildConfiguration()->emitProFileEvaluateNeeded(); qmakeBuildConfiguration()->emitProFileEvaluateNeeded();
} }