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

Android: Use a more direct access to the tools' path

Browse Source 
Change-Id: I49c574144fd4d6b2edd829538c424465c1fe7f05
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-27 14:44:44 +02:00
parent 1e35f09251
commit 68c3103f76
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1424,10 +1424,10 @@ void AndroidConfigurations::updateAutomaticKitList()
KitManager::deregisterKit(k);
}
Environment AndroidConfigurations::toolsEnvironment(const AndroidConfig &config)
Environment AndroidConfig::toolsEnvironment() const
{
Environment env = Environment::systemEnvironment();
FilePath jdkLocation = config.openJDKLocation();
FilePath jdkLocation = openJDKLocation();
if (!jdkLocation.isEmpty()) {
env.set(Constants::JAVA_HOME_ENV_VAR, jdkLocation.toUserOutput());
env.prependOrSetPath(jdkLocation.pathAppended("bin"));