diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2022-01-25 21:29:00 +0300 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2022-02-04 11:59:27 +0000 |
| commit | e0502b32c49d877a790b6f36ddc3f63e5d2f1bc2 (patch) | |
| tree | a65f0e7c6df313631f75138b06d6d8090f8ea38b /src/app | |
| parent | cb3d7e862c69c59e3b0111e19ace157be07acb88 (diff) | |
Do not use std::string in HostOsInfo
We are not going away from Qt and converting QString
to std::strgin and vice versa does not make any sense.
Change-Id: I99c0067a4738566728c503fe39f0d0a945d4e977
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/clangclprobe.cpp | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/gccprobe.cpp | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 3426e15df..08caec657 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -172,7 +172,7 @@ static QString platformFromDirName(const QString &dir) return QStringLiteral("android"); if (dir == QLatin1String("Boot2Qt")) return QStringLiteral("linux"); - return QString::fromStdString(HostOsInfo::hostOSIdentifier()); + return HostOsInfo::hostOSIdentifier(); } QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) diff --git a/src/app/qbs-setup-toolchains/clangclprobe.cpp b/src/app/qbs-setup-toolchains/clangclprobe.cpp index 3643a828d..c9c5a428c 100644 --- a/src/app/qbs-setup-toolchains/clangclprobe.cpp +++ b/src/app/qbs-setup-toolchains/clangclprobe.cpp @@ -101,7 +101,7 @@ void createClangClProfile(const QFileInfo &compiler, Settings *settings, compiler.filePath(), ConsoleLogger::instance()); if (clangCl.isEmpty()) return; - const auto hostArch = QString::fromStdString(HostOsInfo::hostOSArchitecture()); + const auto hostArch = HostOsInfo::hostOSArchitecture(); createProfileHelper( settings, profileName, clangCl.toolchainInstallPath, clangCl.vcvarsallPath, hostArch); } diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp index bbe77bb02..dda8f2274 100644 --- a/src/app/qbs-setup-toolchains/gccprobe.cpp +++ b/src/app/qbs-setup-toolchains/gccprobe.cpp @@ -231,12 +231,9 @@ private: static bool doesProfileTargetOS(const Profile &profile, const QString &os) { const auto target = profile.value(QStringLiteral("qbs.targetPlatform")); - if (target.isValid()) { - return Internal::contains(HostOsInfo::canonicalOSIdentifiers( - target.toString().toStdString()), - os.toStdString()); - } - return Internal::contains(HostOsInfo::hostOSIdentifiers(), os.toStdString()); + if (target.isValid()) + return Internal::contains(HostOsInfo::canonicalOSIdentifiers(target.toString()), os); + return Internal::contains(HostOsInfo::hostOSIdentifiers(), os); } static QString buildProfileName(const QFileInfo &cfi) |