diff options
author | hjk <hjk@qt.io> | 2019-06-19 12:23:55 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-20 10:03:46 +0000 |
commit | 66c2be6715b89546e733889056c1edc977068eb9 (patch) | |
tree | b064f974c4e49f79aa2e5ce10eb7d0652953a344 | |
parent | db409c770c45abc267da9acf5b9bce3eeff1977b (diff) | |
download | qt-creator-66c2be6715b89546e733889056c1edc977068eb9.tar.gz |
Android: Move AndroidToolChain::suggestedGdbServer to only user
Less code and casting.
Change-Id: I43e1b9f90b39a50b2fb4c35fadeb1b244dbe9930
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
-rw-r--r-- | src/plugins/android/androidgdbserverkitinformation.cpp | 4 | ||||
-rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 5 | ||||
-rw-r--r-- | src/plugins/android/androidtoolchain.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index 8414c466e0..e3ab975a8f 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -26,6 +26,7 @@ #include "androidgdbserverkitinformation.h" #include "androidconstants.h" #include "androidtoolchain.h" +#include "androidconfigurations.h" #include <utils/pathchooser.h> #include <utils/elidinglabel.h> @@ -129,8 +130,7 @@ FilePath AndroidGdbServerKitAspect::autoDetect(const Kit *kit) ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) return FilePath(); - auto atc = static_cast<AndroidToolChain *>(tc); - return atc->suggestedGdbServer(); + return AndroidConfigurations::currentConfig().gdbServer(tc->targetAbi()); } /////////////// diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index 26f28ed6c9..8beb1a3101 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -105,11 +105,6 @@ void AndroidToolChain::addToEnvironment(Environment &env) const AndroidConfigurations::currentConfig().sdkLocation().toString()); } -FilePath AndroidToolChain::suggestedGdbServer() const -{ - return AndroidConfigurations::currentConfig().gdbServer(targetAbi()); -} - bool AndroidToolChain::fromMap(const QVariantMap &data) { if (!ClangToolChain::fromMap(data)) diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h index 359ba447f4..e46324d851 100644 --- a/src/plugins/android/androidtoolchain.h +++ b/src/plugins/android/androidtoolchain.h @@ -41,7 +41,6 @@ public: bool isValid() const override; void addToEnvironment(Utils::Environment &env) const override; - Utils::FilePath suggestedGdbServer() const; QStringList suggestedMkspecList() const override; Utils::FilePath makeCommand(const Utils::Environment &environment) const override; bool fromMap(const QVariantMap &data) override; |