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

Support multiple mkspecs per tool chain

Browse Source 
This is necessary to handle Qt 5 moving mkspecs out of unsupported.

Task-number: QTCREATORBUG-6862
Change-Id: I193e3d16467773a2a714ef44f8d441d2d2395801
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-02-07 18:05:09 +01:00
parent b4942447e8
commit 83085439f3
14 changed files with 145 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -45,6 +45,29 @@ static const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ToolChain.DisplayName";
static const char AUTODETECT_KEY[] = "ProjectExplorer.ToolChain.Autodetect";
static const char MKSPEC_KEY[] = "ProjectExplorer.ToolChain.MkSpecOverride";
namespace {
QString mkspecListToString(const QList<Utils::FileName> &specList)
{
QStringList result;
foreach (const Utils::FileName &spec, specList)
result.append(spec.toString());
return result.join(QChar::fromLatin1(';'));
}
QList<Utils::FileName> mkspecListFromString(const QString &string)
{
QList<Utils::FileName> result;
QStringList partList;
if (!string.isEmpty())
partList = string.split(QLatin1Char(';'));
foreach (const QString &part, partList)
result.append(Utils::FileName::fromString(part));
return result;
}
} // namespace
namespace ProjectExplorer {
namespace Internal {
@@ -76,7 +99,7 @@ public:
QString m_id;
bool m_autodetect;
mutable QString m_displayName;
Utils::FileName m_mkspec;
QList<Utils::FileName> m_mkspecList;
};
} // namespace Internal
@@ -143,19 +166,19 @@ QStringList ToolChain::restrictedToTargets() const
return QStringList();
}
Utils::FileName ToolChain::mkspec() const
QList<Utils::FileName> ToolChain::mkspecList() const
{
if (d->m_mkspec.isEmpty())
return suggestedMkspec();
return d->m_mkspec;
if (d->m_mkspecList.isEmpty())
return suggestedMkspecList();
return d->m_mkspecList;
}
void ToolChain::setMkspec(const Utils::FileName &spec)
void ToolChain::setMkspecList(const QList<Utils::FileName> &specList)
{
Utils::FileName oldSpecs = mkspec();
d->m_mkspec = spec;
QList<Utils::FileName> oldSpecList = mkspecList();
d->m_mkspecList = specList;
if (oldSpecs != mkspec())
if (oldSpecList != mkspecList())
toolChainUpdated();
}
@@ -193,7 +216,7 @@ QVariantMap ToolChain::toMap() const
result.insert(QLatin1String(ID_KEY), id());
result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
result.insert(QLatin1String(AUTODETECT_KEY), isAutoDetected());
result.insert(QLatin1String(MKSPEC_KEY), d->m_mkspec.toString());
result.insert(QLatin1String(MKSPEC_KEY), mkspecListToString(d->m_mkspecList));
return result;
}
@@ -223,7 +246,7 @@ bool ToolChain::fromMap(const QVariantMap &data)
// make sure we have new style ids:
d->m_id = Internal::ToolChainPrivate::createId(data.value(QLatin1String(ID_KEY)).toString());
d->m_autodetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool();
d->m_mkspec = Utils::FileName::fromString(data.value(QLatin1String(MKSPEC_KEY)).toString());
d->m_mkspecList = mkspecListFromString(data.value(QLatin1String(MKSPEC_KEY)).toString());
return true;
}