feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtVersion: Make sure BaseQtVersion environment is set consistently

Browse Source 
Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2020-04-16 14:38:46 +02:00
parent 6f32538c5d
commit 5a7586fca6
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidqtversion.cpp
View File

@@ -124,7 +124,9 @@ Abis AndroidQtVersion::detectQtAbis() const
void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) 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) // 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_HOST"), config.toolchainHost(this));
env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation(this).toUserOutput()); env.set(QLatin1String("ANDROID_NDK_ROOT"), config.ndkLocation(this).toUserOutput());

6
src/plugins/ios/iosqtversion.cpp
View File

@@ -72,12 +72,6 @@ Abis IosQtVersion::detectQtAbis() const
return abis; return abis;
} }
void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
{
Q_UNUSED(k)
Q_UNUSED(env)
}
QString IosQtVersion::description() const QString IosQtVersion::description() const
{ {
//: Qt Version is meant for Ios //: Qt Version is meant for Ios

2
src/plugins/ios/iosqtversion.h
View File

@@ -45,8 +45,6 @@ public:
ProjectExplorer::Abis detectQtAbis() const override; 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> availableFeatures() const override;
QSet<Core::Id> targetDeviceTypes() const override; QSet<Core::Id> targetDeviceTypes() const override;