Android: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*

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 <[email protected]>
Reviewed-by: Alessandro Portale <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index 4881abb5ba4..4a96b1ccc26 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -651,11 +651,11 @@ void AndroidDeviceManager::setupDevicesWatcher()
 
     // Setup AVD filesystem watcher to listen for changes when an avd is created/deleted,
     // or started/stopped
-    QString avdEnvVar = qEnvironmentVariable("ANDROID_AVD_HOME");
+    QString avdEnvVar = qtcEnvironmentVariable("ANDROID_AVD_HOME");
     if (avdEnvVar.isEmpty()) {
-        avdEnvVar = qEnvironmentVariable("ANDROID_SDK_HOME");
+        avdEnvVar = qtcEnvironmentVariable("ANDROID_SDK_HOME");
         if (avdEnvVar.isEmpty())
-            avdEnvVar = qEnvironmentVariable("HOME");
+            avdEnvVar = qtcEnvironmentVariable("HOME");
         avdEnvVar.append("/.android/avd");
     }
     const FilePath avdPath = FilePath::fromUserInput(avdEnvVar);