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

Fix debug on Android 6+ with NDK r11+

Browse Source 
Task-number: QTCREATORBUG-16721
Change-Id: Ic65f13076794b75d6e4551b68d26fd3752f82098
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
BogDan Vatra
2016-09-04 19:12:16 +03:00
parent 84b7e199ac
commit 258dc5d2e4
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -384,7 +384,8 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *
rp.nativeMixedEnabled = bool(nativeMixedOverride);
rp.cppEngineType = DebuggerKitInformation::engineType(kit);
rp.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
if (rp.sysRoot.isEmpty())
rp.sysRoot = SysRootKitInformation::sysRoot(kit).toString();
rp.debuggerCommand = DebuggerKitInformation::debuggerCommand(kit).toString();
rp.device = DeviceKitInformation::device(kit);