3 files changed, 12 insertions, 12 deletions
diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt
index 1c749971c5..9cd4eb1d33 100644
--- a/src/platformsupport/kmsconvenience/CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/CMakeLists.txt
@@ -1,6 +1,7 @@
-# Generated from kmsconvenience.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
-qt_find_package(Libdrm) # special case
+qt_find_package(Libdrm)
 
 #####################################################################
 ## KmsSupportPrivate Module:
@@ -18,7 +19,5 @@ qt_internal_add_module(KmsSupportPrivate
         Libdrm::Libdrm
         Qt::CorePrivate
         Qt::GuiPrivate
+    NO_GENERATE_CPP_EXPORTS
 )
-
-#### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
-# MODULE = "kms_support"
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index 74d7bafe1b..421e9f05c0 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -200,7 +200,7 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
     if (userConnectorConfig.contains(QStringLiteral("virtualPos"))) {
         const QByteArray vpos = userConnectorConfig.value(QStringLiteral("virtualPos")).toByteArray();
         const QByteArrayList vposComp = vpos.split(',');
-        if (vposComp.count() == 2)
+        if (vposComp.size() == 2)
             vinfo->virtualPos = QPoint(vposComp[0].trimmed().toInt(), vposComp[1].trimmed().toInt());
     }
     if (userConnectorConfig.value(QStringLiteral("primary")).toBool())
@@ -284,7 +284,7 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
 
     if (current < 0 && crtc_mode.clock != 0) {
         modes << crtc_mode;
-        current = mode.size() - 1;
+        current = modes.size() - 1;
     }
 
     if (configuration == OutputConfigCurrent)
@@ -437,7 +437,7 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
         }
     }
     qCDebug(qLcKmsDebug, "Output %s can use %d planes: %s",
-            connectorName.constData(), int(output.available_planes.count()), qPrintable(planeListStr));
+            connectorName.constData(), int(output.available_planes.size()), qPrintable(planeListStr));
 
     // This is for the EGLDevice/EGLStream backend. On some of those devices one
     // may want to target a pre-configured plane. It is probably useless for
@@ -478,7 +478,7 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
         const QStringList crtcPlanePairs = val.split(u':');
         for (const QString &crtcPlanePair : crtcPlanePairs) {
             const QStringList values = crtcPlanePair.split(u',');
-            if (values.count() == 2 && uint(values[0].toInt()) == output.crtc_id) {
+            if (values.size() == 2 && uint(values[0].toInt()) == output.crtc_id) {
                 uint planeId = values[1].toInt();
                 for (QKmsPlane &kmsplane : m_planes) {
                     if (kmsplane.id == planeId) {
@@ -716,10 +716,11 @@ void QKmsDevice::createScreens()
         // virtualIndex. This is not only handy but also required since for instance
         // evdevtouch relies on it when performing touch device - screen mapping.
         if (!m_screenConfig->separateScreens()) {
+            qCDebug(qLcKmsDebug) << "  virtual position is" << virtualPos;
             siblings.append(s);
             virtualPositions.append(virtualPos);
             if (orderedScreen.vinfo.isPrimary)
-                primarySiblingIdx = siblings.count() - 1;
+                primarySiblingIdx = siblings.size() - 1;
         } else {
             registerScreen(s, orderedScreen.vinfo.isPrimary, virtualPos, QList<QPlatformScreen *>() << s);
         }
@@ -727,7 +728,7 @@ void QKmsDevice::createScreens()
 
     if (!m_screenConfig->separateScreens()) {
         // enable the virtual desktop
-        for (int i = 0; i < siblings.count(); ++i)
+        for (int i = 0; i < siblings.size(); ++i)
             registerScreen(siblings[i], i == primarySiblingIdx, virtualPositions[i], siblings);
     }
 }
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
index b00ff5b304..050d836cb1 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h
+++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h
@@ -30,7 +30,7 @@
 #include <functional>
 
 // In less fortunate cases one may need to build on a system with dev headers
-// from the dark ages. Let's pull a GL and define the missing stuff outselves.
+// from the dark ages. Let's pull a GL and define the missing stuff ourselves.
 
 #ifndef DRM_PLANE_TYPE_OVERLAY
 #define DRM_PLANE_TYPE_OVERLAY 0