Merge 1.14 into master

Change-Id: Ie432987ee2d3ccaa6e881b1b01f142185eddabd8

4 files changed, 58 insertions, 20 deletions

diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp
index e916a405b..eccd3ccae 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp
@@ -192,26 +192,50 @@ static std::vector<ToolchainInstallInfo> installedSdccsFromRegistry()
     std::vector<ToolchainInstallInfo> 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, Version::fromString(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 ToolchainInstallInfo &info) {
+                return candidate == SdccInstallInfo{
+                    info.compilerPath.filePath(), info.compilerVersion.toString()};
+            });
+            if (infosIt == infosEnd)
+                infos.push_back({candidate.compilerPath, Version::fromString(candidate.version)});
         }
     }
 
diff --git a/src/app/qbs-setup-toolchains/sdccprobe.h b/src/app/qbs-setup-toolchains/sdccprobe.h
index 5fad90e96..aa2c613f3 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.h
+++ b/src/app/qbs-setup-toolchains/sdccprobe.h
@@ -42,6 +42,8 @@
 
 #include <QtCore/qlist.h>
 
+#include <tuple>
+
 QT_BEGIN_NAMESPACE
 class QFileInfo;
 QT_END_NAMESPACE
@@ -51,6 +53,18 @@ class Profile;
 class Settings;
 }
 
+struct SdccInstallInfo
+{
+    QString compilerPath;
+    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,
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<const Transformer *> transformers;
     for (const Artifact * const output : filterByType<Artifact>(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