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

ProjectExplorer: Move ToolChainType enumeration into separate Header.

Browse Source 
Acked-By: dt
This commit is contained in:
Friedemann Kleint
2010-11-01 14:14:17 +01:00
parent 34e2e491f4
commit 6510a749b7
58 changed files with 397 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -38,6 +38,7 @@
#include "qt-s60/abldparser.h"
#include "qt-s60/sbsv2parser.h"
#include <projectexplorer/toolchain.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorer.h>
@@ -173,8 +174,8 @@ bool MakeStep::init()
// but for now this is the least invasive change
if (toolchain) {
if (toolchain->type() != ProjectExplorer::ToolChain::MSVC &&
toolchain->type() != ProjectExplorer::ToolChain::WINCE) {
if (toolchain->type() != ProjectExplorer::ToolChain_MSVC &&
toolchain->type() != ProjectExplorer::ToolChain_WINCE) {
if (m_makeCmd.isEmpty())
args << "-w";
}
@@ -314,11 +315,11 @@ void MakeStepConfigWidget::updateDetails()
// so we only do it for unix and if the user didn't override the make command
// but for now this is the least invasive change
QStringList args = m_makeStep->userArguments();
ProjectExplorer::ToolChain::ToolChainType t = ProjectExplorer::ToolChain::UNKNOWN;
ProjectExplorer::ToolChainType t = ProjectExplorer::ToolChain_UNKNOWN;
ProjectExplorer::ToolChain *toolChain = bc->toolChain();
if (toolChain)
t = toolChain->type();
if (t != ProjectExplorer::ToolChain::MSVC && t != ProjectExplorer::ToolChain::WINCE) {
if (t != ProjectExplorer::ToolChain_MSVC && t != ProjectExplorer::ToolChain_WINCE) {
if (m_makeStep->m_makeCmd.isEmpty())
args << "-w";
}