diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8a411df68d1..86e8d32ac6a 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -31,7 +31,6 @@ #include <utils/algorithm.h> #include <utils/environment.h> -#include <utils/environment.h> #include <utils/hostosinfo.h> #include <utils/persistentsettings.h> #include <utils/qtcassert.h> @@ -1513,7 +1512,7 @@ static FilePath androidStudioPath() 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()) return jdkHome; 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); |