Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ife31dad3c8dc43c5ff4d266e6d646230c5d20a50

1 files changed, 6 insertions, 6 deletions

diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 284ba999c2..1e2cbf6da6 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -100,15 +100,15 @@ bool qdbus_loadLibDBus()
     };
 
     lib->unload();
-    for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) {
-        for (uint j = 0; j < sizeof(baseNames) / sizeof(baseNames[0]); ++j) {
+    for (const int majorversion : majorversions) {
+        for (const QString &baseName : baseNames) {
 #ifdef Q_OS_WIN
             QString suffix;
-            if (majorversions[i] != -1)
-                suffix = QString::number(- majorversions[i]); // negative so it prepends the dash
-            lib->setFileName(baseNames[j] + suffix);
+            if (majorversion != -1)
+                suffix = QString::number(- majorversion); // negative so it prepends the dash
+            lib->setFileName(baseName + suffix);
 #else
-            lib->setFileNameAndVersion(baseNames[j], majorversions[i]);
+            lib->setFileNameAndVersion(baseName, majorversion);
 #endif
             if (lib->load() && lib->resolve("dbus_connection_open_private"))
                 return true;