diff options
| author | hjk <hjk@qt.io> | 2019-08-30 12:00:57 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-09-24 11:20:51 +0000 |
| commit | bcaeb73e68b1880848252c634626c57bd6f18221 (patch) | |
| tree | 26e787ddc7084d97c94470ad133b08223353223b /src/plugins/android/androiddebugsupport.cpp | |
| parent | bef986f3fde6a591734c7b2eedc76a036d854bde (diff) | |
| download | qt-creator-bcaeb73e68b1880848252c634626c57bd6f18221.tar.gz | |
ProjectExplorer: Store parts of active build config in runcontrol
... on runcontrol creation to prevent later access. Adapt some users.
There are more to come.
Change-Id: I2a3fe5eea0ada4eff7d08b79a6f49694e6962c8a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android/androiddebugsupport.cpp')
| -rw-r--r-- | src/plugins/android/androiddebugsupport.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 0481df89b2..dce03b052c 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -35,7 +35,6 @@ #include <debugger/debuggerrunconfigurationaspect.h> #include <debugger/debuggerruncontrol.h> -#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/target.h> @@ -139,11 +138,11 @@ void AndroidDebugSupport::start() if (qtVersion) solibSearchPath.append(qtVersion->qtSoPaths()); solibSearchPath.append(uniquePaths(extraLibs)); - solibSearchPath.append(target->activeBuildConfiguration()->buildDirectory().toString()); + solibSearchPath.append(runControl()->buildDirectory().toString()); solibSearchPath.removeDuplicates(); setSolibSearchPath(solibSearchPath); qCDebug(androidDebugSupportLog) << "SoLibSearchPath: "<<solibSearchPath; - setSymbolFile(target->activeBuildConfiguration()->buildDirectory().pathAppended("app_process")); + setSymbolFile(runControl()->buildDirectory().pathAppended("app_process")); setSkipExecutableValidation(true); setUseExtendedRemote(true); QString devicePreferredAbi = AndroidManager::devicePreferredAbi(target); |