diff options
| author | Oswald Buddenhagen <[email protected]> | 2012-04-19 16:13:09 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2012-04-19 16:13:09 +0200 |
| commit | 822233629d71375008b633b8678f9e31c9ee7dc0 (patch) | |
| tree | 0c59ba19deb261e7421f6bd797761d02a5bca237 /src/plugins/debugger | |
| parent | c863662bb276e1649f01f77559b3f9ca10cf60b7 (diff) | |
| parent | ca516cf31d1a1d3b2d921c5e4ceed7c70a260f24 (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
qtcreator.pri
src/libs/utils/utils.qbs
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmljseditor/qmljseditor.qbs
src/plugins/qmljsinspector/qmljsinspector.qbs
Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
Diffstat (limited to 'src/plugins/debugger')
| -rw-r--r-- | src/plugins/debugger/debugger.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerrunner.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 9b54e1d3003..2da0988c086 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -305,6 +305,7 @@ QtcPlugin { } ProductModule { + Depends { name: "cpp" } cpp.includePaths: ["."] } } diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index e19dad83c6a..e193f9613ae 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -521,7 +521,7 @@ static QList<DebuggerEngineType> enginesForToolChain(const Abi &toolChain, result.push_back(CdbEngineType); } else { result.push_back(CdbEngineType); - result.push_back(GdbEngineType); + //result.push_back(GdbEngineType); } if (languages & QmlLanguage) result.push_back(QmlEngineType); |