diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2020-01-08 12:16:08 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2020-01-14 21:19:56 +0000 |
commit | ae79b40561a3152142e1dc26562e2b9e70c97640 (patch) | |
tree | 559bb5de3069c506b9c6ec2c056b197d32f26165 /src/plugins/android/androidavdmanager.cpp | |
parent | 0c1db9183172bbf1d0df8d9bf81a4cd27d2c35c1 (diff) |
Android: Fix AVD info parsing for renamed instances
Android Studio's AVD manager renames the AVD info file to match the
instance ID.
Task-number: QTCREATORBUG-23448
Change-Id: Id8ff0a53ae93b168c55442166072d14c5c84d2e0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androidavdmanager.cpp')
-rw-r--r-- | src/plugins/android/androidavdmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index def7d767dc0..df0a8fd9c64 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -494,7 +494,7 @@ bool AvdManagerOutputParser::parseAvd(const QStringList &deviceInfo, AndroidDevi qCDebug(avdManagerLog) << "Avd Parsing: Cannot find ABI:" << configFile; // Get Target - QString avdInfoFileName = avdPath.toFileInfo().baseName() + ".ini"; + const QString avdInfoFileName = avd->avdname + ".ini"; const Utils::FilePath avdInfoFile = avdPath.parentDir().pathAppended(avdInfoFileName); QSettings avdInfo(avdInfoFile.toString(), QSettings::IniFormat); |