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

Android: Use better filepath conversion for AvdPath

Browse Source 
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 <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-01-24 16:27:54 +01:00
parent 15f33422cb
commit d57dd8462e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,8 +236,7 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
info.avdName = dev->extraData(Constants::AndroidAvdName).toString(); info.avdName = dev->extraData(Constants::AndroidAvdName).toString();
info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString(); info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString();
info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList(); info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList();
const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString(); info.avdPath = FilePath::fromSettings(dev->extraData(Constants::AndroidAvdPath));
info.avdPath = FilePath::fromUserInput(avdPath);
info.sdk = dev->extraData(Constants::AndroidSdk).toInt(); info.sdk = dev->extraData(Constants::AndroidSdk).toInt();
info.type = dev->machineType(); info.type = dev->machineType();
@@ -334,12 +333,12 @@ int AndroidDevice::sdkLevel() const
FilePath AndroidDevice::avdPath() const FilePath AndroidDevice::avdPath() const
{ {
return FilePath::fromUserInput(extraData(Constants::AndroidAvdPath).toString()); return FilePath::fromSettings(extraData(Constants::AndroidAvdPath));
} }
void AndroidDevice::setAvdPath(const FilePath &path) void AndroidDevice::setAvdPath(const FilePath &path)
{ {
setExtraData(Constants::AndroidAvdPath, path.toUserOutput()); setExtraData(Constants::AndroidAvdPath, path.toSettings());
initAvdSettings(); initAvdSettings();
} }