Android: Use better filepath conversion for AvdPath

This is internal data, so to/fromVariant should do. However, the
device extra data is stored in settings, so stay on the safe side.

Change-Id: I2a673d4dc07b45d1b7b829796ad57540a5e49c20
Reviewed-by: Alessandro Portale <[email protected]>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index cfe92acf5bc..252e4ee1fba 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -236,8 +236,7 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
     info.avdName = dev->extraData(Constants::AndroidAvdName).toString();
     info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString();
     info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList();
-    const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString();
-    info.avdPath = FilePath::fromUserInput(avdPath);
+    info.avdPath = FilePath::fromSettings(dev->extraData(Constants::AndroidAvdPath));
     info.sdk = dev->extraData(Constants::AndroidSdk).toInt();
     info.type = dev->machineType();
 
@@ -334,12 +333,12 @@ int AndroidDevice::sdkLevel() const
 
 FilePath AndroidDevice::avdPath() const
 {
-    return FilePath::fromUserInput(extraData(Constants::AndroidAvdPath).toString());
+    return FilePath::fromSettings(extraData(Constants::AndroidAvdPath));
 }
 
 void AndroidDevice::setAvdPath(const FilePath &path)
 {
-    setExtraData(Constants::AndroidAvdPath, path.toUserOutput());
+    setExtraData(Constants::AndroidAvdPath, path.toSettings());
     initAvdSettings();
 }