From 5a7586fca6eb6080dca79eef3a8da2796137b83c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 16 Apr 2020 14:38:46 +0200 Subject: [PATCH] QtVersion: Make sure BaseQtVersion environment is set consistently Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76 Reviewed-by: Eike Ziller --- src/plugins/android/androidqtversion.cpp | 4 +++- src/plugins/ios/iosqtversion.cpp | 6 ------ src/plugins/ios/iosqtversion.h | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 9b6a2df57c5..b3b602830a5 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -124,7 +124,9 @@ Abis AndroidQtVersion::detectQtAbis() const void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const { - const AndroidConfig &config =AndroidConfigurations::currentConfig(); + BaseQtVersion::addToEnvironment(k, env); + + const AndroidConfig &config = AndroidConfigurations::currentConfig(); // this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info) env.set(QLatin1String("ANDROID_NDK_HOST"), config.toolchainHost(this)); env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation(this).toUserOutput()); diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index 23fb2c5dde7..35ca7f39b48 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -72,12 +72,6 @@ Abis IosQtVersion::detectQtAbis() const return abis; } -void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const -{ - Q_UNUSED(k) - Q_UNUSED(env) -} - QString IosQtVersion::description() const { //: Qt Version is meant for Ios diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h index fa119d2f6f5..5f82e945693 100644 --- a/src/plugins/ios/iosqtversion.h +++ b/src/plugins/ios/iosqtversion.h @@ -45,8 +45,6 @@ public: ProjectExplorer::Abis detectQtAbis() const override; - void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override; - QSet availableFeatures() const override; QSet targetDeviceTypes() const override;