diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-06 14:13:25 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-06 12:53:52 +0000 |
commit | 4ac80fe3a0c18af83a22d650be46e10911995b91 (patch) | |
tree | 6223dd08600fa3d24c49118dea1789b3107fdd4d /src/plugins/projectexplorer/customtoolchain.cpp | |
parent | 3576b7e12810f0ac72985aed1682106193eef205 (diff) |
ToolChains: Trigger ToolChainManager::toolChainChanged signal
Trigger ToolChainManager::toolChainChanged signal when something
changes. This was apparently missing in quite a few places of
some of the tool chains.
Change-Id: Ic94c6559e6267f4ff22dc74cc5b0865fb7aeac63
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/customtoolchain.cpp')
-rw-r--r-- | src/plugins/projectexplorer/customtoolchain.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index a910450113..e14562ca1b 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -164,7 +164,10 @@ const QStringList &CustomToolChain::rawPredefinedMacros() const void CustomToolChain::setPredefinedMacros(const QStringList &list) { + if (m_predefinedMacros == list) + return; m_predefinedMacros = list; + toolChainUpdated(); } QList<HeaderPath> CustomToolChain::systemHeaderPaths(const QStringList &cxxFlags, const FileName &) const @@ -215,9 +218,14 @@ QStringList CustomToolChain::headerPathsList() const void CustomToolChain::setHeaderPaths(const QStringList &list) { - m_systemHeaderPaths = Utils::transform(list, [](const QString &headerPath) { + QList<HeaderPath> tmp = Utils::transform(list, [](const QString &headerPath) { return HeaderPath(headerPath.trimmed(), HeaderPath::GlobalHeaderPath); }); + + if (m_systemHeaderPaths == tmp) + return; + m_systemHeaderPaths = tmp; + toolChainUpdated(); } void CustomToolChain::setCompilerCommand(const FileName &path) @@ -261,8 +269,14 @@ const QStringList &CustomToolChain::cxx11Flags() const void CustomToolChain::setMkspecs(const QString &specs) { - m_mkspecs = Utils::transform(specs.split(QLatin1Char(',')), - [](QString fn) { return FileName::fromString(fn); }); + Utils::FileNameList tmp + = Utils::transform(specs.split(QLatin1Char(',')), + [](QString fn) { return FileName::fromString(fn); }); + + if (tmp == m_mkspecs) + return; + m_mkspecs = tmp; + toolChainUpdated(); } QString CustomToolChain::mkspecs() const @@ -367,7 +381,10 @@ CustomToolChain::OutputParser CustomToolChain::outputParserType() const void CustomToolChain::setOutputParserType(CustomToolChain::OutputParser parser) { + if (m_outputParser == parser) + return; m_outputParser = parser; + toolChainUpdated(); } CustomParserSettings CustomToolChain::customParserSettings() const @@ -377,7 +394,10 @@ CustomParserSettings CustomToolChain::customParserSettings() const void CustomToolChain::setCustomParserSettings(const CustomParserSettings &settings) { + if (m_customParserSettings == settings) + return; m_customParserSettings = settings; + toolChainUpdated(); } QString CustomToolChain::parserName(CustomToolChain::OutputParser parser) |