diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-02-02 19:57:07 +0100 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-03 13:53:45 +0000 |
commit | 6a945fd22293fb81e0ec6ff75cac9dc7346c230d (patch) | |
tree | cd8dc9569c777e6820d6f2447e78762de4f25911 | |
parent | e13b891996ee5619b2b17cadaf7b2a7b06e25f9c (diff) |
Be more tolerant to exceptions when adding gcc profiles
Fixes: QBS-1524
Change-Id: Ie6c619244d6689db7a6815dd87f67e137e6dc5bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/app/qbs-setup-toolchains/gccprobe.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp index 1e0f9c142..86e5e5d2e 100644 --- a/src/app/qbs-setup-toolchains/gccprobe.cpp +++ b/src/app/qbs-setup-toolchains/gccprobe.cpp @@ -585,8 +585,12 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString const QStringList toolchainTypes = toolchainTypeFromCompilerName( candidate.baseName()); const QString profileName = buildProfileName(candidate); - auto profile = createGccProfile(candidate, settings, - toolchainTypes, profileName); - profiles.push_back(std::move(profile)); + try { + auto profile = createGccProfile(candidate, settings, + toolchainTypes, profileName); + profiles.push_back(std::move(profile)); + } catch (const qbs::ErrorInfo &info) { + qbsWarning() << Tr::tr("Skipping %1: %2").arg(profileName, info.toString()); + } } } |