5 files changed, 12 insertions, 13 deletions
diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
index 280d48058c..7bd7daec0d 100644
--- a/src/platformsupport/fbconvenience/CMakeLists.txt
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from fbconvenience.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## FbSupportPrivate Module:
@@ -21,7 +22,5 @@ qt_internal_add_module(FbSupportPrivate
         Qt::GuiPrivate
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
+    NO_GENERATE_CPP_EXPORTS
 )
-
-#### Keys ignored in scope 1:.:.:fbconvenience.pro:<TRUE>:
-# MODULE = "fb_support"
diff --git a/src/platformsupport/fbconvenience/qfbcursor.cpp b/src/platformsupport/fbconvenience/qfbcursor.cpp
index c686cbf731..9f7e964760 100644
--- a/src/platformsupport/fbconvenience/qfbcursor.cpp
+++ b/src/platformsupport/fbconvenience/qfbcursor.cpp
@@ -33,7 +33,7 @@ QFbCursor::QFbCursor(QFbScreen *screen)
     if (!mVisible)
         return;
 
-    mCursorImage = new QPlatformCursorImage(0, 0, 0, 0, 0, 0);
+    mCursorImage.reset(new QPlatformCursorImage(0, 0, 0, 0, 0, 0));
     setCursor(Qt::ArrowCursor);
 
     mDeviceListener = new QFbCursorDeviceListener(this);
diff --git a/src/platformsupport/fbconvenience/qfbcursor_p.h b/src/platformsupport/fbconvenience/qfbcursor_p.h
index 88ac5bd561..a118440ac9 100644
--- a/src/platformsupport/fbconvenience/qfbcursor_p.h
+++ b/src/platformsupport/fbconvenience/qfbcursor_p.h
@@ -77,7 +77,7 @@ private:
     QRect mPrevRect;         // last place the cursor was drawn
     bool mDirty;
     bool mOnScreen;
-    QPlatformCursorImage *mCursorImage;
+    QScopedPointer<QPlatformCursorImage> mCursorImage;
     QFbCursorDeviceListener *mDeviceListener;
     QPoint m_pos;
 };
diff --git a/src/platformsupport/fbconvenience/qfbscreen.cpp b/src/platformsupport/fbconvenience/qfbscreen.cpp
index 21574133dc..85e2f57198 100644
--- a/src/platformsupport/fbconvenience/qfbscreen.cpp
+++ b/src/platformsupport/fbconvenience/qfbscreen.cpp
@@ -63,7 +63,7 @@ void QFbScreen::addWindow(QFbWindow *window)
     }
     setDirty(window->geometry());
     QWindow *w = topWindow();
-    QWindowSystemInterface::handleWindowActivated(w);
+    QWindowSystemInterface::handleFocusWindowChanged(w);
     topWindowChanged(w);
 }
 
@@ -72,7 +72,7 @@ void QFbScreen::removeWindow(QFbWindow *window)
     mWindowStack.removeOne(window);
     setDirty(window->geometry());
     QWindow *w = topWindow();
-    QWindowSystemInterface::handleWindowActivated(w);
+    QWindowSystemInterface::handleFocusWindowChanged(w);
     topWindowChanged(w);
 }
 
@@ -84,7 +84,7 @@ void QFbScreen::raise(QFbWindow *window)
     mWindowStack.move(index, 0);
     setDirty(window->geometry());
     QWindow *w = topWindow();
-    QWindowSystemInterface::handleWindowActivated(w);
+    QWindowSystemInterface::handleFocusWindowChanged(w);
     topWindowChanged(w);
 }
 
@@ -96,7 +96,7 @@ void QFbScreen::lower(QFbWindow *window)
     mWindowStack.move(index, mWindowStack.size() - 1);
     setDirty(window->geometry());
     QWindow *w = topWindow();
-    QWindowSystemInterface::handleWindowActivated(w);
+    QWindowSystemInterface::handleFocusWindowChanged(w);
     topWindowChanged(w);
 }
 
@@ -120,7 +120,7 @@ QWindow *QFbScreen::topLevelAt(const QPoint & p) const
 
 int QFbScreen::windowCount() const
 {
-    return mWindowStack.count();
+    return mWindowStack.size();
 }
 
 void QFbScreen::setDirty(const QRect &rect)
@@ -210,7 +210,7 @@ QRegion QFbScreen::doRedraw()
 
 QFbWindow *QFbScreen::windowForId(WId wid) const
 {
-    for (int i = 0; i < mWindowStack.count(); ++i) {
+    for (int i = 0; i < mWindowStack.size(); ++i) {
         if (mWindowStack[i]->winId() == wid)
             return mWindowStack[i];
     }
diff --git a/src/platformsupport/fbconvenience/qfbwindow.cpp b/src/platformsupport/fbconvenience/qfbwindow.cpp
index 7fbb56f126..54716cc497 100644
--- a/src/platformsupport/fbconvenience/qfbwindow.cpp
+++ b/src/platformsupport/fbconvenience/qfbwindow.cpp
@@ -9,7 +9,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static QBasicAtomicInt winIdGenerator = Q_BASIC_ATOMIC_INITIALIZER(0);
+Q_CONSTINIT static QBasicAtomicInt winIdGenerator = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 QFbWindow::QFbWindow(QWindow *window)
     : QPlatformWindow(window), mBackingStore(0), mWindowState(Qt::WindowNoState)