3 files changed, 5 insertions, 13 deletions
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index e64e6b9c70..34370807ae 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from vnc.pro.
-
 #####################################################################
 ## QVncIntegrationPlugin Plugin:
 #####################################################################
@@ -10,7 +8,7 @@
 qt_internal_add_plugin(QVncIntegrationPlugin
     OUTPUT_NAME qvnc
     PLUGIN_TYPE platforms
-    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case
+    DEFAULT_IF "vnc" IN_LIST QT_QPA_PLATFORMS
     SOURCES
         main.cpp
         qvnc.cpp qvnc_p.h
@@ -28,9 +26,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
         Qt::Network
 )
 
-#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
-# OTHER_FILES = "vnc.json"
-
 ## Scopes:
 #####################################################################
 
@@ -38,6 +33,3 @@ qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSuppor
     LIBRARIES
         Qt::InputSupportPrivate
 )
-
-#### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
-# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index 60aae51100..99e80e5801 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -567,7 +567,7 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
         cursor = *platformImage.image();
         hotspot = platformImage.hotspot();
     }
-    for (auto client : qAsConst(clients))
+    for (auto client : std::as_const(clients))
         client->setDirtyCursor();
 }
 
@@ -583,7 +583,7 @@ void QVncClientCursor::addClient(QVncClient *client)
 uint QVncClientCursor::removeClient(QVncClient *client)
 {
     clients.removeOne(client);
-    return clients.count();
+    return clients.size();
 }
 #endif // QT_CONFIG(cursor)
 
@@ -613,7 +613,7 @@ QVncServer::~QVncServer()
 
 void QVncServer::setDirty()
 {
-    for (auto client : qAsConst(clients))
+    for (auto client : std::as_const(clients))
         client->setDirty(qvnc_screen->dirtyRegion);
 
     qvnc_screen->clearDirty();
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index c67e5a0073..c87df20ef6 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -41,7 +41,7 @@ bool QVncScreen::initialize()
     mDepth = 32;
     mPhysicalSize = QSizeF(mGeometry.width()/96.*25.4, mGeometry.height()/96.*25.4);
 
-    for (const QString &arg : qAsConst(mArgs)) {
+    for (const QString &arg : std::as_const(mArgs)) {
         QRegularExpressionMatch match;
         if (arg.contains(mmSizeRx, &match)) {
             mPhysicalSize = QSizeF(match.captured("width").toDouble(), match.captured("height").toDouble());