From ee199c3fed3e9241614d456126789313bfb00d47 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 7 Dec 2020 18:08:32 +0200 Subject: [PATCH] Android: setSticky behavior to follow other platform's kits Don't set the whole kit's values to sticky, instead set only device, toolchain, qt version properties to sticky to follow the behavior of other platform's kits. This also allow users to set specific CMake version for the kits in case the selected one is not correct, since Android plugin doensn't handle that anyway. Fixes: QTCREATORBUG-25042 Change-Id: Ia6f6474b5ad9132e841e6e7024113439649b61f1 Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 4c7a5183684..307faa3b5c0 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1347,7 +1347,11 @@ void AndroidConfigurations::updateAutomaticKitList() DeviceKitAspect::setDevice(k, device); QStringList abis = static_cast(qt)->androidAbis(); Debugger::DebuggerKitAspect::setDebugger(k, findOrRegisterDebugger(tc, abis, QtKitAspect::qtVersion(k))); - k->makeSticky(); + + k->setSticky(ToolChainKitAspect::id(), true); + k->setSticky(QtSupport::QtKitAspect::id(), true); + k->setSticky(DeviceKitAspect::id(), true); + k->setSticky(DeviceTypeKitAspect::id(), true); QString versionStr = QLatin1String("Qt %{Qt:Version}"); if (!qt->isAutodetected())