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

BaseQtVersion: Remove getters for configValues and qtConfigValues

Browse Source 
They are unused.

Change-Id: I4350fe33af24e418eb318518f7ca66301d9a7519
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-30 14:43:42 +02:00
parent b489bfd615
commit 7debb513e2
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -175,9 +175,6 @@ public:
bool m_qmakeIsExecutable = true; bool m_qmakeIsExecutable = true;
bool m_hasQtAbis = false; bool m_hasQtAbis = false;
QStringList m_configValues;
QStringList m_qtConfigValues;
QString m_unexpandedDisplayName; QString m_unexpandedDisplayName;
QString m_autodetectionSource; QString m_autodetectionSource;
QSet<Core::Id> m_overrideFeatures; QSet<Core::Id> m_overrideFeatures;
@@ -1078,11 +1075,10 @@ void BaseQtVersion::ensureMkSpecParsed() const
void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{ {
d->m_configValues = evaluator->values("CONFIG"); const QStringList configValues = evaluator->values("CONFIG");
d->m_qtConfigValues = evaluator->values("QT_CONFIG");
d->m_defaultConfigIsDebugAndRelease = false; d->m_defaultConfigIsDebugAndRelease = false;
d->m_frameworkBuild = false; d->m_frameworkBuild = false;
for (const QString &value : qAsConst(d->m_configValues)) { for (const QString &value : configValues) {
if (value == "debug") if (value == "debug")
d->m_defaultConfigIsDebug = true; d->m_defaultConfigIsDebug = true;
else if (value == "release") else if (value == "release")
@@ -1332,18 +1328,6 @@ QStringList BaseQtVersion::qtSoPaths() const
return Utils::toList(paths); return Utils::toList(paths);
} }
QStringList BaseQtVersion::configValues() const
{
ensureMkSpecParsed();
return d->m_configValues;
}
QStringList BaseQtVersion::qtConfigValues() const
{
ensureMkSpecParsed();
return d->m_qtConfigValues;
}
MacroExpander *BaseQtVersion::macroExpander() const MacroExpander *BaseQtVersion::macroExpander() const
{ {
return d->m_expander.macroExpander(this); return d->m_expander.macroExpander(this);

3
src/plugins/qtsupport/baseqtversion.h
View File

@@ -226,9 +226,6 @@ public:
bool hasDebugBuild() const; bool hasDebugBuild() const;
bool hasReleaseBuild() const; bool hasReleaseBuild() const;
QStringList configValues() const;
QStringList qtConfigValues() const;
Utils::MacroExpander *macroExpander() const; // owned by the Qt version Utils::MacroExpander *macroExpander() const; // owned by the Qt version
static std::unique_ptr<Utils::MacroExpander> static std::unique_ptr<Utils::MacroExpander>
createMacroExpander(const std::function<const BaseQtVersion *()> &qtVersion); createMacroExpander(const std::function<const BaseQtVersion *()> &qtVersion);