diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-05-05 12:26:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-05-08 15:13:29 +0000 |
| commit | 5009bafea25dd4725cabb381733d2cbefc33ba54 (patch) | |
| tree | 4e721fb81950d66a1abad8b453590d35502bde30 /src/plugins/android/androiddebugsupport.cpp | |
| parent | 63e395c876b6d2de74c48dd287c04d037b4e26a1 (diff) | |
Android: Fix C++ debuggingv4.3.0-rc1
Target Async mode enabled only for ndk version > 11
Task-number: QTCREATORBUG-18111
Change-Id: I218b6c23c1da13091f0035193a43e6117748055a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/android/androiddebugsupport.cpp')
| -rw-r--r-- | src/plugins/android/androiddebugsupport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 25967ba2e2..9da8ff511a 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -104,8 +104,10 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration * params.displayName = AndroidManager::packageName(target); params.remoteSetupNeeded = true; params.useContinueInsteadOfRun = true; - if (!Utils::HostOsInfo::isWindowsHost()) // Workaround for NDK 11c(b?) + if (!Utils::HostOsInfo::isWindowsHost() && + AndroidConfigurations::currentConfig().ndkVersion() >= QVersionNumber(11, 0, 0)) { params.useTargetAsync = true; + } auto aspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>(); if (aspect->useCppDebugger()) { |