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

Remove the project parameter to ToolChain::defaultMakeTarget again.

Browse Source
This commit is contained in:
con
2009-06-22 14:32:54 +02:00
parent a9d05dab62
commit f3eb79b198
7 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,10 @@
#include "projectloadwizard.h"
#include "qtversionmanager.h"
#ifdef QTCREATOR_WITH_S60
#include "qt-s60/gccetoolchain.h"
#endif
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/coreconstants.h>
@@ -385,6 +389,11 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
{
if (!m_toolChain) {
m_toolChain = qtVersion(buildConfiguration)->createToolChain(toolChainType(buildConfiguration));
#ifdef QTCREATOR_WITH_S60
if (m_toolChain->type() == ToolChain::GCCE) {
static_cast<GCCEToolChain *>(m_toolChain)->setProject(this);
}
#endif
}
return m_toolChain;
}
@@ -396,7 +405,7 @@ QString Qt4Project::makeCommand(const QString &buildConfiguration) const
QString Qt4Project::defaultMakeTarget(const QString &buildConfiguration) const
{
return toolChain(buildConfiguration)->defaultMakeTarget(this);
return toolChain(buildConfiguration)->defaultMakeTarget();
}
void Qt4Project::updateCodeModel()