3 files changed, 4 insertions, 13 deletions
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index 7f950c1957..ba18cea50c 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from linuxfb.pro.
-
 #####################################################################
 ## QLinuxFbIntegrationPlugin Plugin:
 #####################################################################
@@ -10,7 +8,7 @@
 qt_internal_add_plugin(QLinuxFbIntegrationPlugin
     OUTPUT_NAME qlinuxfb
     PLUGIN_TYPE platforms
-    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case
+    DEFAULT_IF "linuxfb" IN_LIST QT_QPA_PLATFORMS
     SOURCES
         main.cpp
         qlinuxfbintegration.cpp qlinuxfbintegration.h
@@ -25,9 +23,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
         Qt::GuiPrivate
 )
 
-#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
-# OTHER_FILES = "linuxfb.json"
-
 ## Scopes:
 #####################################################################
 
@@ -42,6 +37,3 @@ qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupp
     LIBRARIES
         Qt::KmsSupportPrivate
 )
-
-#### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
-# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
index 076cf49ba7..56b28ba48c 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
@@ -125,8 +125,7 @@ void QLinuxFbDevice::close()
 
 void *QLinuxFbDevice::nativeDisplay() const
 {
-    Q_UNREACHABLE();
-    return nullptr;
+    Q_UNREACHABLE_RETURN(nullptr);
 }
 
 QPlatformScreen *QLinuxFbDevice::createScreen(const QKmsOutput &output)
@@ -408,7 +407,7 @@ QRegion QLinuxFbDrmScreen::doRedraw()
     // Image has alpha but no need for blending at this stage.
     // Do not waste time with the default SourceOver.
     pntr.setCompositionMode(QPainter::CompositionMode_Source);
-    for (const QRect &rect : qAsConst(output->dirty[output->backFb]))
+    for (const QRect &rect : std::as_const(output->dirty[output->backFb]))
         pntr.drawImage(rect, mScreenImage, rect);
     pntr.end();
 
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
index 24cab2ee23..e2826f3946 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
@@ -286,7 +286,7 @@ bool QLinuxFbScreen::initialize()
     bool doSwitchToGraphicsMode = true;
 
     // Parse arguments
-    for (const QString &arg : qAsConst(mArgs)) {
+    for (const QString &arg : std::as_const(mArgs)) {
         QRegularExpressionMatch match;
         if (arg == "nographicsmodeswitch"_L1)
             doSwitchToGraphicsMode = false;