QtVersion: Make sure BaseQtVersion environment is set consistently

Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/android/androidqtversion.cpp

@@ -124,6 +124,8 @@ Abis AndroidQtVersion::detectQtAbis() const
 
 void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
 {
+    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));

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

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<Core::Id> availableFeatures() const override;
     QSet<Core::Id> targetDeviceTypes() const override;