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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
This commit is contained in:
Eike Ziller
2011-10-28 10:17:44 +02:00
parent 2ee0b36342 5dcf7d2ef0
commit 81cce8902e
214 changed files with 35000 additions and 21166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,6 +371,7 @@ bool Qt4Project::fromMap(const QVariantMap &map)
if (t->buildConfigurations().isEmpty()) {
qWarning() << "Removing" << t->id() << "since it has no buildconfigurations!";
removeTarget(t);
delete t;
}
}
@@ -555,7 +556,9 @@ void Qt4Project::updateCppCodeModel()
}
// Add mkspec directory
if (activeBC->qtVersion())
if (rootQt4ProjectNode())
allIncludePaths.append(rootQt4ProjectNode()->resolvedMkspecPath());
else if (activeBC->qtVersion())
allIncludePaths.append(activeBC->qtVersion()->mkspecPath());
allIncludePaths.append(predefinedIncludePaths);
@@ -961,10 +964,12 @@ QtSupport::ProFileReader *Qt4Project::createProFileReader(Qt4ProFileNode *qt4Pro
m_proFileOption->environment.insert(env.key(eit), env.value(eit));
QStringList args;
if (QMakeStep *qs = bc->qmakeStep())
if (QMakeStep *qs = bc->qmakeStep()) {
args = qs->parserArguments();
else
m_proFileOption->qmakespec = qs->mkspec();
} else {
args = bc->configCommandLineArguments();
}
m_proFileOption->setCommandLineArguments(args);
}
@@ -979,6 +984,11 @@ QtSupport::ProFileReader *Qt4Project::createProFileReader(Qt4ProFileNode *qt4Pro
return reader;
}
ProFileOption *Qt4Project::proFileOption()
{
return m_proFileOption;
}
void Qt4Project::destroyProFileReader(QtSupport::ProFileReader *reader)
{
delete reader;