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

ProjectExplorer: Replace the fromMap error return value for toolchains

Browse Source 
... by some out-of-band mechanism, keeping previous functionality.

The driving reason is to get the same fromMap signature as in the
AspectContainer base.

Change-Id: Ife7fbf4d0e0f78d88729021eb5220ec4a8ddb2ec
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-21 19:15:02 +02:00
parent 678e8d3137
commit c558896594
13 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidtoolchain.cpp
View File

@@ -101,11 +101,13 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
env.set(QLatin1String("ANDROID_SDK_ROOT"), config.sdkLocation().toUserOutput());
}
bool AndroidToolChain::fromMap(const QVariantMap &data)
void AndroidToolChain::fromMap(const QVariantMap &data)
{
if (!ClangToolChain::fromMap(data))
return false;
return isValid();
ClangToolChain::fromMap(data);
if (hasError())
return;
if (!isValid())
reportError();
}
QStringList AndroidToolChain::suggestedMkspecList() const

2
src/plugins/android/androidtoolchain.h
View File

@@ -22,7 +22,7 @@ public:
QStringList suggestedMkspecList() const override;
Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
bool fromMap(const QVariantMap &data) override;
void fromMap(const QVariantMap &data) override;
void setNdkLocation(const Utils::FilePath &ndkLocation);
Utils::FilePath ndkLocation() const;