From d5a5088996dd43595fd1cf07a5846ed3c66a441d Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 16 Jan 2024 19:16:58 +0100 Subject: QtSupport: Increase QtVersionData's version to 3 Qt Creator 12.0.0 has created presistent storage with empty QtAbis list. Qt Creator 12.0.1 has fixed this issue. By increasing the version number to 3 we force the saved data from Qt Creator 12.0.0 to be recreated, and thus fix Android issues with empty QtAbis lists. Also make sure that an empty QtAbis is loaded. Fixes: QTCREATORBUG-30208 Change-Id: I89a9a1ff810304127ff0387b80cb9a13f9740538 Reviewed-by: Marcus Tillmanns --- src/plugins/qtsupport/baseqtversion.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/plugins/qtsupport') diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 5e5d29c30d..de41610cd4 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -78,7 +78,7 @@ class QtVersionData { public: // Update version if you add data members! - static const int version = 2; + static const int version = 3; bool installed = true; bool hasExamples = false; @@ -207,8 +207,11 @@ public: hostDataPath = FilePath::fromSettings(map.value("HostDataPath")); hostPrefixPath = FilePath::fromSettings(map.value("HostPrefixPath")); auto it = map.find("QtAbis"); - if (it != map.end()) - qtAbis = Utils::transform(it.value().toStringList(), &Abi::fromString); + if (it != map.end()) { + const auto qtAbisList = it.value().toStringList(); + if (!qtAbisList.isEmpty()) + qtAbis = Utils::transform(qtAbisList, &Abi::fromString); + } versionInfo = fromStore(map.value("VersionInfo").value()); } }; -- cgit v1.2.3