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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
This commit is contained in:
Eike Ziller
2013-03-04 15:07:19 +01:00
parent 04f2533c36 fde3803ca8
commit 7545ce072f
79 changed files with 1070 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -34,6 +34,7 @@
#include <projectexplorer/abi.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/toolchainmanager.h>
#include <utils/environment.h>
#include <utils/qtcassert.h>
@@ -201,6 +202,7 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
void DebuggerKitInformation::setup(Kit *k)
{
QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return);
setDebuggerItem(k, autoDetectItem(k));
}