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

Android: Move AndroidToolChain::suggestedGdbServer to only user

Browse Source 
Less code and casting.

Change-Id: I43e1b9f90b39a50b2fb4c35fadeb1b244dbe9930
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2019-06-19 12:23:55 +02:00
parent db409c770c
commit 66c2be6715
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -26,6 +26,7 @@
#include "androidgdbserverkitinformation.h" #include "androidgdbserverkitinformation.h"
#include "androidconstants.h" #include "androidconstants.h"
#include "androidtoolchain.h" #include "androidtoolchain.h"
#include "androidconfigurations.h"
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/elidinglabel.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); ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID)
return FilePath(); return FilePath();
auto atc = static_cast<AndroidToolChain *>(tc); return AndroidConfigurations::currentConfig().gdbServer(tc->targetAbi());
return atc->suggestedGdbServer();
} }
/////////////// ///////////////

5
src/plugins/android/androidtoolchain.cpp
View File

@@ -105,11 +105,6 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
AndroidConfigurations::currentConfig().sdkLocation().toString()); AndroidConfigurations::currentConfig().sdkLocation().toString());
} }
FilePath AndroidToolChain::suggestedGdbServer() const
{
return AndroidConfigurations::currentConfig().gdbServer(targetAbi());
}
bool AndroidToolChain::fromMap(const QVariantMap &data) bool AndroidToolChain::fromMap(const QVariantMap &data)
{ {
if (!ClangToolChain::fromMap(data)) if (!ClangToolChain::fromMap(data))

1
src/plugins/android/androidtoolchain.h
View File

@@ -41,7 +41,6 @@ public:
bool isValid() const override; bool isValid() const override;
void addToEnvironment(Utils::Environment &env) const override; void addToEnvironment(Utils::Environment &env) const override;
Utils::FilePath suggestedGdbServer() const;
QStringList suggestedMkspecList() const override; QStringList suggestedMkspecList() const override;
Utils::FilePath makeCommand(const Utils::Environment &environment) const override; Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
bool fromMap(const QVariantMap &data) override; bool fromMap(const QVariantMap &data) override;