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

Qmake: Move some non-configuration code from build config to build system

Browse Source 
Change-Id: I6fdf20e740c2824cabb3659f36379f9325ab97bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-11-20 15:51:44 +01:00
parent e63444b45d
commit 5bac811432
5 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,6 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/toolchainmanager.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h>
@@ -110,10 +108,6 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
{
m_buildSystem = new QmakeBuildSystem(this);
connect(this, &BuildConfiguration::buildDirectoryChanged,
this, &QmakeBuildConfiguration::emitProFileEvaluateNeeded);
connect(this, &BuildConfiguration::environmentChanged,
this, &QmakeBuildConfiguration::emitProFileEvaluateNeeded);
connect(target, &Target::kitChanged,
this, &QmakeBuildConfiguration::kitChanged);
MacroExpander *expander = macroExpander();
@@ -123,10 +117,6 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
return file;
return QLatin1String("Makefile");
});
connect(ToolChainManager::instance(), &ToolChainManager::toolChainUpdated,
this, &QmakeBuildConfiguration::toolChainUpdated);
connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged,
this, &QmakeBuildConfiguration::qtVersionsChanged);
}
void QmakeBuildConfiguration::initialize()
@@ -207,23 +197,11 @@ void QmakeBuildConfiguration::kitChanged()
// This only checks if the ids have changed!
// For that reason the QmakeBuildConfiguration is also connected
// to the toolchain and qtversion managers
emitProFileEvaluateNeeded();
m_buildSystem->scheduleUpdateAllNowOrLater();
m_lastKitState = newState;
}
}
void QmakeBuildConfiguration::toolChainUpdated(ToolChain *tc)
{
if (ToolChainKitAspect::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID) == tc)
emitProFileEvaluateNeeded();
}
void QmakeBuildConfiguration::qtVersionsChanged(const QList<int> &,const QList<int> &, const QList<int> &changed)
{
if (changed.contains(QtKitAspect::qtVersionId(target()->kit())))
emitProFileEvaluateNeeded();
}
BuildSystem *QmakeBuildConfiguration::buildSystem() const
{
return m_buildSystem;
@@ -280,13 +258,8 @@ void QmakeBuildConfiguration::setQMakeBuildConfiguration(BaseQtVersion::QmakeBui
m_qmakeBuildConfiguration = config;
emit qmakeBuildConfigurationChanged();
emitProFileEvaluateNeeded();
emit buildTypeChanged();
}
void QmakeBuildConfiguration::emitProFileEvaluateNeeded()
{
m_buildSystem->scheduleUpdateAllNowOrLater();
emit buildTypeChanged();
}
QString QmakeBuildConfiguration::unalignedBuildDirWarning()