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

Merge branch '2.7'

Browse Source 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
This commit is contained in:
Oswald Buddenhagen
2013-05-15 10:21:47 +02:00
parent c6bee7e20e 8ca5b55a0b
commit 6fb94a7b10
63 changed files with 883 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1786,7 +1786,10 @@ void DebuggerPluginPrivate::attachToQmlPort()
foreach (Project *project, projects)
sourceFiles << project->files(Project::ExcludeGeneratedFiles);
sp.projectSourceDirectory =
!projects.isEmpty() ? projects.first()->projectDirectory() : QString();
sp.projectSourceFiles = sourceFiles;
sp.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
DebuggerRunControlFactory::createAndScheduleRun(sp);
}
@@ -2458,7 +2461,6 @@ void DebuggerPluginPrivate::sessionLoaded()
void DebuggerPluginPrivate::aboutToUnloadSession()
{
m_breakHandler->removeSessionData();
m_toolTipManager->sessionAboutToChange();
}