From 5dd3cff8efdabbd17da9174e072d668879b99ea3 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 21 May 2024 12:17:44 +0200 Subject: [PATCH] Android: Remove unused methods, hide one method in private section Change-Id: Ieeddf1ba1b0fca12deb2a3c4cb4d1344eede41ae Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 5 ----- src/plugins/android/androidconfigurations.h | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 84c92925e45..cd6f0cd481e 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -619,11 +619,6 @@ FilePath AndroidConfig::clangPathFromNdk(const FilePath &ndkLocation) return path.pathAppended("bin/clang").withExecutableSuffix(); } -FilePath AndroidConfig::gdbPath(const Abi &abi, const QtVersion *qtVersion) const -{ - return gdbPathFromNdk(abi, ndkLocation(qtVersion)); -} - FilePath AndroidConfig::makePathFromNdk(const FilePath &ndkLocation) { return ndkLocation.pathAppended( diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 99ae2e5e010..764c102aa1e 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -68,7 +68,6 @@ public: QUrl sdkToolsUrl() const { return m_sdkToolsUrl; } QByteArray getSdkToolsSha256() const { return m_sdkToolsSha256; } - Utils::FilePath ndkSubPathFromQtVersion(const QtSupport::QtVersion &version) const; // relative! QStringList defaultEssentials() const; QStringList essentialsFromQtVersion(const QtSupport::QtVersion &version) const; @@ -79,8 +78,6 @@ public: Utils::FilePath openJDKLocation() const; void setOpenJDKLocation(const Utils::FilePath &openJDKLocation); - Utils::FilePath keystoreLocation() const; - QString toolchainHost(const QtSupport::QtVersion *qtVersion) const; static QString toolchainHostFromNdk(const Utils::FilePath &ndkPath); @@ -103,7 +100,6 @@ public: Utils::OsType hostOs = Utils::HostOsInfo::hostOs()); static Utils::FilePath clangPathFromNdk(const Utils::FilePath &ndkLocation); - Utils::FilePath gdbPath(const ProjectExplorer::Abi &abi, const QtSupport::QtVersion *qtVersion) const; static Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation); Utils::FilePath keytoolPath() const; @@ -138,6 +134,7 @@ public: private: Utils::FilePath openJDKBinPath() const; + Utils::FilePath ndkSubPathFromQtVersion(const QtSupport::QtVersion &version) const; // relative! void parseDependenciesJson();