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

Make QtVersion's toolchain variable.

Browse Source 
QtVersion provides possible toolchains that can be used by the
Qt version, e.g. winscw, gcce and armv5 for symbian-abld.
This commit is contained in:
con
2009-06-09 18:02:23 +02:00
parent 7bec2253c9
commit a3a7c27d5d
8 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -375,14 +375,19 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
m_proFilesForCodeModelUpdate.append(pro);
}
ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfiguration) const
{
return qtVersion(buildConfiguration)->toolChain(qtVersion(buildConfiguration)->defaultToolchainType());
}
QString Qt4Project::makeCommand(const QString &buildConfiguration) const
{
return qtVersion(buildConfiguration)->toolChain()->makeCommand();
return toolChain(buildConfiguration)->makeCommand();
}
QString Qt4Project::defaultMakeTarget(const QString &buildConfiguration) const
{
return qtVersion(buildConfiguration)->toolChain()->defaultMakeTarget(this);
return toolChain(buildConfiguration)->defaultMakeTarget(this);
}
void Qt4Project::updateCodeModel()
@@ -401,7 +406,7 @@ void Qt4Project::updateCodeModel()
QStringList predefinedFrameworkPaths;
QByteArray predefinedMacros;
ToolChain *tc = qtVersion(activeBuildConfiguration())->toolChain();
ToolChain *tc = toolChain(activeBuildConfiguration());
QList<HeaderPath> allHeaderPaths;
if (tc) {
predefinedMacros = tc->predefinedMacros();