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

Android: Remove unused methods, hide one method in private section

Browse Source 
Change-Id: Ieeddf1ba1b0fca12deb2a3c4cb4d1344eede41ae
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 12:17:44 +02:00
parent 7bc65cf9f3
commit 5dd3cff8ef
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,11 +619,6 @@ FilePath AndroidConfig::clangPathFromNdk(const FilePath &ndkLocation)
return path.pathAppended("bin/clang").withExecutableSuffix(); 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) FilePath AndroidConfig::makePathFromNdk(const FilePath &ndkLocation)
{ {
return ndkLocation.pathAppended( return ndkLocation.pathAppended(

5
src/plugins/android/androidconfigurations.h
View File

@@ -68,7 +68,6 @@ public:
QUrl sdkToolsUrl() const { return m_sdkToolsUrl; } QUrl sdkToolsUrl() const { return m_sdkToolsUrl; }
QByteArray getSdkToolsSha256() const { return m_sdkToolsSha256; } QByteArray getSdkToolsSha256() const { return m_sdkToolsSha256; }
Utils::FilePath ndkSubPathFromQtVersion(const QtSupport::QtVersion &version) const; // relative!
QStringList defaultEssentials() const; QStringList defaultEssentials() const;
QStringList essentialsFromQtVersion(const QtSupport::QtVersion &version) const; QStringList essentialsFromQtVersion(const QtSupport::QtVersion &version) const;
@@ -79,8 +78,6 @@ public:
Utils::FilePath openJDKLocation() const; Utils::FilePath openJDKLocation() const;
void setOpenJDKLocation(const Utils::FilePath &openJDKLocation); void setOpenJDKLocation(const Utils::FilePath &openJDKLocation);
Utils::FilePath keystoreLocation() const;
QString toolchainHost(const QtSupport::QtVersion *qtVersion) const; QString toolchainHost(const QtSupport::QtVersion *qtVersion) const;
static QString toolchainHostFromNdk(const Utils::FilePath &ndkPath); static QString toolchainHostFromNdk(const Utils::FilePath &ndkPath);
@@ -103,7 +100,6 @@ public:
Utils::OsType hostOs = Utils::HostOsInfo::hostOs()); Utils::OsType hostOs = Utils::HostOsInfo::hostOs());
static Utils::FilePath clangPathFromNdk(const Utils::FilePath &ndkLocation); 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); static Utils::FilePath makePathFromNdk(const Utils::FilePath &ndkLocation);
Utils::FilePath keytoolPath() const; Utils::FilePath keytoolPath() const;
@@ -138,6 +134,7 @@ public:
private: private:
Utils::FilePath openJDKBinPath() const; Utils::FilePath openJDKBinPath() const;
Utils::FilePath ndkSubPathFromQtVersion(const QtSupport::QtVersion &version) const; // relative!
void parseDependenciesJson(); void parseDependenciesJson();