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

Android: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*

Browse Source 
And instead of qgetenv.
Takes Qt Creator's setting at "Environment > System > Environment" into
account, which makes it easier on some platforms to set them (e.g.
macOS), can be configured differently in different settings paths, and
potentially can be changed at runtime (depending on usage).

Change-Id: I159fb6928954240af742708efbd6776104c4631b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2022-08-24 11:31:04 +02:00
parent 57745407de
commit 55c627efef
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -1513,7 +1512,7 @@ static FilePath androidStudioPath()
FilePath AndroidConfig::getJdkPath() FilePath AndroidConfig::getJdkPath()
{ {
FilePath jdkHome = FilePath::fromString(qEnvironmentVariable(Constants::JAVA_HOME_ENV_VAR)); FilePath jdkHome = FilePath::fromString(qtcEnvironmentVariable(Constants::JAVA_HOME_ENV_VAR));
if (jdkHome.exists()) if (jdkHome.exists())
return jdkHome; return jdkHome;

6
src/plugins/android/androiddevice.cpp
View File

@@ -651,11 +651,11 @@ void AndroidDeviceManager::setupDevicesWatcher()
// Setup AVD filesystem watcher to listen for changes when an avd is created/deleted, // Setup AVD filesystem watcher to listen for changes when an avd is created/deleted,
// or started/stopped // or started/stopped
QString avdEnvVar = qEnvironmentVariable("ANDROID_AVD_HOME"); QString avdEnvVar = qtcEnvironmentVariable("ANDROID_AVD_HOME");
if (avdEnvVar.isEmpty()) { if (avdEnvVar.isEmpty()) {
avdEnvVar = qEnvironmentVariable("ANDROID_SDK_HOME"); avdEnvVar = qtcEnvironmentVariable("ANDROID_SDK_HOME");
if (avdEnvVar.isEmpty()) if (avdEnvVar.isEmpty())
avdEnvVar = qEnvironmentVariable("HOME"); avdEnvVar = qtcEnvironmentVariable("HOME");
avdEnvVar.append("/.android/avd"); avdEnvVar.append("/.android/avd");
} }
const FilePath avdPath = FilePath::fromUserInput(avdEnvVar); const FilePath avdPath = FilePath::fromUserInput(avdEnvVar);