From 5b6f320047332bbe07b04730eb537d473002acd3 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 11 Sep 2019 08:49:38 +0300 Subject: Fix MSVC warnings 'return': conversion from 'size_t' to 'int' Change-Id: I18e8fa03a9303855693da3027b722b104cee5d6d Reviewed-by: Richard Weickelt Reviewed-by: hjk --- src/lib/corelib/buildgraph/rulenode.cpp | 2 +- src/lib/corelib/tools/joblimits.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/corelib/buildgraph/rulenode.cpp b/src/lib/corelib/buildgraph/rulenode.cpp index 516b9b830..bf25b1da8 100644 --- a/src/lib/corelib/buildgraph/rulenode.cpp +++ b/src/lib/corelib/buildgraph/rulenode.cpp @@ -227,7 +227,7 @@ int RuleNode::transformerCount() const Set transformers; for (const Artifact * const output : filterByType(parents)) transformers.insert(output->transformer.get()); - return transformers.size(); + return int(transformers.size()); } ArtifactSet RuleNode::currentInputArtifacts() const diff --git a/src/lib/corelib/tools/joblimits.cpp b/src/lib/corelib/tools/joblimits.cpp index 912b15a65..1a3e3a498 100644 --- a/src/lib/corelib/tools/joblimits.cpp +++ b/src/lib/corelib/tools/joblimits.cpp @@ -149,7 +149,7 @@ bool JobLimits::isEmpty() const int JobLimits::count() const { - return d->jobLimits.size(); + return int(d->jobLimits.size()); } JobLimit JobLimits::jobLimitAt(int i) const -- cgit v1.2.3 From a1ab897a8be63af3de3f97724ee6fede6ba2bc3a Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Mon, 23 Sep 2019 16:21:47 +0300 Subject: baremetal: Fix auto detection of SDCC toolchain on Windows The SDCC toolchain package can be provided as 32-bit or as 64-bit installer. If the SDCC 64-bit package will be installed on the 32-bit Windows, then it will not be found in the system registry, because we use the QSettings::NativeFormat. So, we need to check the data for the 32-bit and 64-bit registry sequentially. Change-Id: I15981f39274308e3690cf072396cf1ae82b6743d Reviewed-by: Christian Kandeler --- src/app/qbs-setup-toolchains/sdccprobe.cpp | 59 +++++++++++++++++++++--------- src/app/qbs-setup-toolchains/sdccprobe.h | 8 ++++ 2 files changed, 49 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp index 751e872ee..87c616ff0 100644 --- a/src/app/qbs-setup-toolchains/sdccprobe.cpp +++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp @@ -108,26 +108,49 @@ static std::vector installedSdccsFromRegistry() std::vector infos; if (HostOsInfo::isWindowsHost()) { - -#ifdef Q_OS_WIN64 - static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDCC"; -#else - static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\SDCC"; -#endif - - QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); - QString rootPath = registry.value(QStringLiteral("Default")).toString(); - if (!rootPath.isEmpty()) { + // Tries to detect the candidate from the 32-bit + // or 64-bit system registry format. + auto probeSdccToolchainInfo = [](QSettings::Format format) { + SdccInstallInfo info; + QSettings registry(QStringLiteral("HKEY_LOCAL_MACHINE\\SOFTWARE\\SDCC"), + format); + const QString rootPath = registry.value(QStringLiteral("Default")) + .toString(); + if (rootPath.isEmpty()) + return info; // Build full compiler path. const QFileInfo sdccPath(rootPath + QLatin1String("\\bin\\sdcc.exe")); - if (sdccPath.exists()) { - // Build compiler version. - const QString version = QStringLiteral("%1.%2.%3").arg( - registry.value(QStringLiteral("VersionMajor")).toString(), - registry.value(QStringLiteral("VersionMinor")).toString(), - registry.value(QStringLiteral("VersionRevision")).toString()); - infos.push_back({sdccPath.absoluteFilePath(), version}); - } + if (!sdccPath.exists()) + return info; + info.compilerPath = sdccPath.filePath(); + // Build compiler version. + const QString version = QStringLiteral("%1.%2.%3").arg( + registry.value(QStringLiteral("VersionMajor")).toString(), + registry.value(QStringLiteral("VersionMinor")).toString(), + registry.value(QStringLiteral("VersionRevision")).toString()); + info.version = version; + return info; + }; + + static constexpr QSettings::Format allowedFormats[] = { + QSettings::NativeFormat, +#ifdef Q_OS_WIN + QSettings::Registry32Format, + QSettings::Registry64Format, +#endif + }; + + for (const QSettings::Format format : allowedFormats) { + const SdccInstallInfo candidate = probeSdccToolchainInfo(format); + if (candidate.compilerPath.isEmpty()) + continue; + const auto infosEnd = infos.cend(); + const auto infosIt = std::find_if(infos.cbegin(), infosEnd, + [candidate](const SdccInstallInfo &info) { + return candidate == info; + }); + if (infosIt == infosEnd) + infos.push_back(candidate); } } diff --git a/src/app/qbs-setup-toolchains/sdccprobe.h b/src/app/qbs-setup-toolchains/sdccprobe.h index 7f4219b5a..55062ff19 100644 --- a/src/app/qbs-setup-toolchains/sdccprobe.h +++ b/src/app/qbs-setup-toolchains/sdccprobe.h @@ -42,6 +42,8 @@ #include +#include + QT_BEGIN_NAMESPACE class QFileInfo; QT_END_NAMESPACE @@ -57,6 +59,12 @@ struct SdccInstallInfo QString version; }; +inline bool operator==(const SdccInstallInfo &lhs, const SdccInstallInfo &rhs) +{ + return std::tie(lhs.compilerPath, lhs.version) + == std::tie(rhs.compilerPath, rhs.version); +} + bool isSdccCompiler(const QString &compilerName); void createSdccProfile(const QFileInfo &compiler, qbs::Settings *settings, -- cgit v1.2.3