aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-27 14:22:15 +0200
committerhjk <hjk@qt.io>2019-05-28 11:12:00 +0000
commitcc877949cacf036f7c279087b3e3f47286be3566 (patch)
treecd9787e441987d0361b3176acbae4476e270254d /src/plugins/android
parent774d2063d0d26c7586caf7bf543edb84071c50d1 (diff)
ProjectExplorer: (Re-)start using strings for mkspecs
Even if this is part of a directory name it is naturally closer to a "string" id than a file path. Change-Id: If66f930526744379ce86e2b18bd9eac7fabfe773 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r--src/plugins/android/androidtoolchain.cpp5
-rw-r--r--src/plugins/android/androidtoolchain.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 8de0920e29b..0b65eacf236 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -123,10 +123,9 @@ bool AndroidToolChain::fromMap(const QVariantMap &data)
return isValid();
}
-FileNameList AndroidToolChain::suggestedMkspecList() const
+QStringList AndroidToolChain::suggestedMkspecList() const
{
- return FileNameList() << FileName::fromLatin1("android-g++")
- << FileName::fromLatin1("android-clang");
+ return {"android-g++", "android-clang"};
}
FileName AndroidToolChain::makeCommand(const Environment &env) const
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index da2a5f06973..2a3562172d6 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -44,7 +44,7 @@ public:
Utils::FileName suggestedDebugger() const override;
Utils::FileName suggestedGdbServer() const;
- Utils::FileNameList suggestedMkspecList() const override;
+ QStringList suggestedMkspecList() const override;
Utils::FileName makeCommand(const Utils::Environment &environment) const override;
bool fromMap(const QVariantMap &data) override;