Commit e7993e20 authored by Tobias Hunger's avatar Tobias Hunger

Make profile matching when loading less strict

This should solve another instance where profiles are needlessly
created.

Task-number: QTCREATORBUG-7564
Change-Id: I7ce7810614ffa4c74797f748edc3bd53a3052548
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 393996f1
......@@ -2535,7 +2535,16 @@ void Version11Handler::addBuildConfiguration(const QString &origTarget, Profile
const QVariantMap &bc, bool bcActive)
{
foreach (Profile *i, m_targets.keys()) {
if (*i == *p) {
const QString tc = i->value(Core::Id("PE.Profile.ToolChain")).toString();
const int qt = i->value(Core::Id("QtSupport.QtInformation")).toInt();
const QString debugger = i->value(Core::Id("Debugger.Information")).toString();
const QString mkspec = i->value(Core::Id("QtPM4.mkSpecInformation")).toString();
if ((i->value(Core::Id("PE.Profile.DeviceType")).toString() == p->value(Core::Id("PE.Profile.DeviceType")).toString())
&& (tc.isEmpty() || (tc == p->value(Core::Id("PE.Profile.ToolChain")).toString()))
&& (qt < 0 || (qt == p->value(Core::Id("QtSupport.QtInformation")).toInt()))
&& (debugger.isEmpty() || (debugger == p->value(Core::Id("Debugger.Information")).toString()))
&& (mkspec.isEmpty() || (mkspec == p->value(Core::Id("QtPM4.mkSpecInformation")).toString()))
&& (i->value(Core::Id("PE.Profile.SysRoot")).toString() == p->value(Core::Id("PE.Profile.SysRoot")).toString())) {
delete p;
p = i;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment