diff options
author | Christian Kandeler <[email protected]> | 2025-03-11 15:56:20 +0100 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2025-03-11 15:26:32 +0000 |
commit | 995f96f9994aff70db6965a98e6ad665daee78c9 (patch) | |
tree | 0f4c49252846de142a4231dad901068c9440adb8 /src/plugins/android/androidutils.cpp | |
parent | 217b18417d740658ef0e29938205c190581eddc9 (diff) |
Project managers: Replace various uses of ProjectConfiguration::target()
Some were wrong, others unneeded.
Change-Id: I308288e75f8d1b192863171661d72d27f1e6da07
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/android/androidutils.cpp')
-rw-r--r-- | src/plugins/android/androidutils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androidutils.cpp b/src/plugins/android/androidutils.cpp index 0156ee818ab..b8c1722cd85 100644 --- a/src/plugins/android/androidutils.cpp +++ b/src/plugins/android/androidutils.cpp @@ -223,9 +223,9 @@ QString buildTargetSDK(const BuildConfiguration *bc) return fallback; } -QStringList applicationAbis(const Target *target) +QStringList applicationAbis(const Kit *k) { - auto qt = dynamic_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(target->kit())); + auto qt = dynamic_cast<AndroidQtVersion *>(QtSupport::QtKitAspect::qtVersion(k)); return qt ? qt->androidAbis() : QStringList(); } @@ -241,13 +241,13 @@ QString archTriplet(const QString &abi) return {"arm-linux-androideabi"}; } -QJsonObject deploymentSettings(const Target *target) +QJsonObject deploymentSettings(const Kit *k) { - QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit()); + QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(k); if (!qt) return {}; - auto tc = ToolchainKitAspect::cxxToolchain(target->kit()); + auto tc = ToolchainKitAspect::cxxToolchain(k); if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID) return {}; QJsonObject settings; @@ -256,7 +256,7 @@ QJsonObject deploymentSettings(const Target *target) settings["ndk"] = AndroidConfig::ndkLocation(qt).toFSPathString(); settings["sdk"] = AndroidConfig::sdkLocation().toFSPathString(); if (!qt->supportsMultipleQtAbis()) { - const QStringList abis = applicationAbis(target); + const QStringList abis = applicationAbis(k); QTC_ASSERT(abis.size() == 1, return {}); settings["stdcpp-path"] = (AndroidConfig::toolchainPath(qt) / "sysroot/usr/lib" / archTriplet(abis.first()) / "libc++_shared.so") |