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

Move mkspec policy into the Qt4 targets

Browse Source 
For embedded we do not want to override the mkspec as used in the Qt version
since that was most likely tweaked to work with the tool chain selected.

In a generic desktop target we want to be able to switch between different
compilers of the same ABI.

Change-Id: Ib49e54dd15e78c2459b17c552a3c31cb3dce63eb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-11-01 17:19:30 +01:00
parent 08dd5fea41
commit abbfc62f03
5 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -457,17 +457,7 @@ QString QMakeStep::mkspec()
}
}
QtSupport::BaseQtVersion *version = bc->qtVersion();
// We do not know which abi the Qt version has, so let's stick with the defaults
if (version && version->qtAbis().count() == 1 && version->qtAbis().first().isNull())
return QString();
const QString tcSpec = bc->toolChain() ? bc->toolChain()->mkspec() : QString();
if (!version)
return tcSpec;
if (!tcSpec.isEmpty() && version->hasMkspec(tcSpec))
return tcSpec;
return version->mkspec();
return static_cast<Qt4BaseTarget *>(target())->mkspec(bc);
}
QVariantMap QMakeStep::toMap() const