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

Qt Version refactoring

Browse Source 
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
This commit is contained in:
dt
2011-05-04 13:14:46 +02:00
parent 9ef4ea40f2
commit 8e171e0be0
104 changed files with 4411 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,9 +203,13 @@ bool MakeStep::init()
setEnabled(true);
pp->setArguments(args);
ProjectExplorer::IOutputParser *parser = bc->qtVersion()->createOutputParser();
Q_ASSERT(parser);
parser->appendOutputParser(new QtParser);
ProjectExplorer::IOutputParser *parser = 0;
if (bc->qtVersion())
parser = bc->qtVersion()->createOutputParser();
if (parser)
parser->appendOutputParser(new QtParser);
else
parser = new QtParser;
if (toolchain)
parser->appendOutputParser(toolchain->outputParser());