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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
This commit is contained in:
Eike Ziller
2013-11-15 10:26:57 +01:00
parent b9a85f5a08 0904f6e836
commit 4538ccb46c
326 changed files with 6324 additions and 4987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakebuildinfo.h
View File

@@ -35,7 +35,9 @@
#include <projectexplorer/buildinfo.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/target.h>
#include <projectexplorer/project.h>
#include <utils/environment.h>
#include <utils/qtcassert.h>
namespace CMakeProjectManager {
@@ -43,7 +45,7 @@ class CMakeBuildInfo : public ProjectExplorer::BuildInfo
{
public:
CMakeBuildInfo(const ProjectExplorer::IBuildConfigurationFactory *f) :
ProjectExplorer::BuildInfo(f) { }
ProjectExplorer::BuildInfo(f), useNinja(false) { }
CMakeBuildInfo(const Internal::CMakeBuildConfiguration *bc) :
ProjectExplorer::BuildInfo(ProjectExplorer::IBuildConfigurationFactory::find(bc->target()))
@@ -53,6 +55,9 @@ public:
kitId = bc->target()->kit()->id();
environment = bc->environment();
useNinja = bc->useNinja();
QTC_ASSERT(bc->target()->project(), return);
sourceDirectory = bc->target()->project()->projectDirectory();
}
Utils::Environment environment;

5
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -58,11 +58,10 @@ void CMakeParser::stdError(const QString &line)
{
QString trimmedLine = rightTrimmed(line);
if (trimmedLine.isEmpty() && !m_lastTask.isNull()) {
if (m_skippedFirstEmptyLine) {
if (m_skippedFirstEmptyLine)
doFlush();
} else {
else
m_skippedFirstEmptyLine = true;
}
return;
}
if (m_skippedFirstEmptyLine)