qpa: Remove references to lighthouse

Change-Id: I37646113f626c878883cff49f4e186ec71bcfa15
Reviewed-by: Paul Olav Tvete <[email protected]>

36 files changed, 9 insertions, 83 deletions

diff --git a/src/gui/image/qbmphandler_p.h b/src/gui/image/qbmphandler_p.h
index fd044fc4420..e1d744e5390 100644
--- a/src/gui/image/qbmphandler_p.h
+++ b/src/gui/image/qbmphandler_p.h
@@ -98,7 +98,7 @@ struct BMP_INFOHDR {                     // BMP information header
 // BMP-Handler, which is also able to read and write the DIB
 // (Device-Independent-Bitmap) format used internally in the Windows operating
 // system for OLE/clipboard operations. DIB is a subset of BMP (without file
-// header). The Windows-Lighthouse plugin accesses the DIB-functionality.
+// header). The Windows platform plugin accesses the DIB-functionality.
 
 class QBmpHandler : public QImageIOHandler
 {
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 269f236ecd2..c8db8b2996f 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -78,7 +78,7 @@ static bool qt_pixmap_thread_test()
     if (qApp->thread() != QThread::currentThread()) {
         bool fail = false;
         if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps)) {
-            printf("Lighthouse plugin does not support threaded pixmaps!\n");
+            printf("Platform plugin does not support threaded pixmaps!\n");
             fail = true;
         }
         if (fail) {
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index bffe1a10e0d..b6046b0fc5b 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -2268,7 +2268,7 @@ bool QFontEngineMulti::canRender(const QChar *string, int len) const
     return true;
 }
 
-/* Implement alphaMapForGlyph() which is called by Lighthouse/Windows code.
+/* Implement alphaMapForGlyph() which is called by QPA Windows code.
  * Ideally, that code should be fixed to correctly handle QFontEngineMulti. */
 
 QImage QFontEngineMulti::alphaMapForGlyph(glyph_t glyph)
diff --git a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp
index 20cfb5155ec..ca4bc4091ba 100644
--- a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp
+++ b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp
@@ -53,11 +53,10 @@ QT_BEGIN_NAMESPACE
 
     Maintains a global stack storing the current event dispatcher and
     its processing flags for access from the Windows procedure
-    qWindowsWndProc. Handling the Lighthouse gui events should be done
+    qWindowsWndProc. Handling the QPA gui events should be done
     from within the qWindowsWndProc to ensure correct processing of messages.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsGuiEventDispatcher::QWindowsGuiEventDispatcher(QObject *parent) :
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 095b9218256..0d4bc288ea6 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -593,7 +593,7 @@ void QFontconfigDatabase::populateFontDatabase()
         ++f;
     }
 
-    //Lighthouse has very lazy population of the font db. We want it to be initialized when
+    //QPA has very lazy population of the font db. We want it to be initialized when
     //QApplication is constructed, so that the population procedure can do something like this to
     //set the default font
 //    const FcDefaultFont *s = defaults;
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 36a94724c10..178088db5dd 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -587,7 +587,6 @@ namespace {
 /*!
     \struct QWindowsFontEngineData
     \brief Static constant data shared by the font engines.
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsFontEngineData::QWindowsFontEngineData()
@@ -673,10 +672,9 @@ static inline bool initDirectWrite(QWindowsFontEngineData *d)
     delayed population of the database again passing a font name
     to EnumFontFamiliesEx(), working around the fact that
     EnumFontFamiliesEx() does not list all fonts by default.
-    This should be introduced to Lighthouse as well?
+    This should be introduced to QPA as well?
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
index 2ae378c5586..8cf224337b6 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine.cpp
@@ -215,7 +215,6 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
     \class QWindowsFontEngine
     \brief Standard Windows font engine.
     \internal
-    \ingroup qt-lighthouse-win
 
     Will probably be superseded by a common Free Type font engine in Qt 5.X.
 */
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
index ecf60495047..a79d9a3aa70 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@@ -207,7 +207,6 @@ static DWRITE_RENDERING_MODE hintingPreferenceToRenderingMode(QFont::HintingPref
     \class QWindowsFontEngineDirectWrite
     \brief Windows font engine using Direct Write.
     \internal
-    \ingroup qt-lighthouse-win
 
     Font engine for subpixel positioned text on Windows Vista
     (with platform update) and Windows 7. If selected during
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
index b1133dca223..ad277ea7cde 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage.cpp
@@ -60,7 +60,6 @@ typedef struct {
 
     \sa QWindowsBackingStore
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 static inline HDC createDC()
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
index 69a1854598b..95351f688bc 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.h
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.h
@@ -45,7 +45,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It provides helper functions
-// for the Cocoa lighthouse plugin. This header file may
+// for the Cocoa plugin. This header file may
 // change from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
index d0baea5b362..000bcd708b7 100644
--- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm
@@ -74,8 +74,6 @@ QT_BEGIN_NAMESPACE
 
     Input method support in Cocoa uses NSTextInput protorol. Therefore
     almost all functionality is implemented in QNSView.
-
-    \ingroup qt-lighthouse-cocoa
 */
 
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
index 9689d6a89b8..95b30ec447b 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.cpp
@@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
     \class QWindowsDirect2DBackingStore
     \brief Backing store for windows.
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 static inline QWindowsDirect2DPlatformPixmap *platformPixmap(QPixmap *p)
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp
index 1929f800a47..94d8470ab14 100644
--- a/src/plugins/platforms/windows/main.cpp
+++ b/src/plugins/platforms/windows/main.cpp
@@ -46,10 +46,9 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \group qt-lighthouse-win
-    \title Qt Lighthouse plugin for Windows
+    \title Qt platform plugin for Windows
 
-    \brief Class documentation of the  Qt Lighthouse plugin for Windows.
+    \brief Class documentation of the  Qt platform plugin for Windows.
 
     \section1 Supported Parameters
 
@@ -78,7 +77,6 @@ QT_BEGIN_NAMESPACE
     \class QWindowsIntegrationPlugin
     \brief Plugin.
     \internal
-    \ingroup qt-lighthouse-win
  */
 
 /*!
@@ -86,7 +84,6 @@ QT_BEGIN_NAMESPACE
 
     \brief Namespace for enumerations, etc.
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 /*!
@@ -97,7 +94,6 @@ QT_BEGIN_NAMESPACE
     With flags that should help to structure the code.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
index bd7bdc55d17..e3939ca2d73 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
@@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
     \class QWindowsBackingStore
     \brief Backing store for windows.
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsBackingStore::QWindowsBackingStore(QWindow *window) :
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
index efcb0b6e6ed..b23904e9780 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -71,7 +71,6 @@ QT_BEGIN_NAMESPACE
     \note The OLE-functions used in this class require OleInitialize().
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -110,7 +109,6 @@ static QDebug operator<<(QDebug d, const QMimeData *mimeData)
 
     \sa QWindowsInternalMimeDataBase, QWindowsClipboard
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 IDataObject *QWindowsClipboardRetrievalMimeData::retrieveDataObject() const
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 820f00560aa..0d357b1605c 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -185,7 +185,6 @@ static bool enableNonClientDpiScaling(HWND hwnd)
     \sa QWindowsShell32DLL
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 void QWindowsUser32DLL::init()
@@ -251,7 +250,6 @@ QWindowsContext *QWindowsContext::m_instance = nullptr;
     Holds state information formerly stored in \c qapplication_win.cpp.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 typedef QHash<HWND, QWindowsWindow *> HandleBaseWindowHash;
@@ -1673,7 +1671,6 @@ static inline bool isTopLevel(HWND hwnd)
     There is another one for timers, sockets, etc in
     QEventDispatcherWin32.
 
-    \ingroup qt-lighthouse-win
 */
 
 extern "C" LRESULT QT_WIN_CALLBACK qWindowsWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 19de3d59393..338bb9ff8fe 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -73,7 +73,6 @@ Q_GUI_EXPORT HBITMAP qt_createIconMask(const QBitmap &bitmap);
     \brief Cache key for storing values in a QHash with a QCursor as key.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsPixmapCursorCacheKey::QWindowsPixmapCursorCacheKey(const QCursor &c)
@@ -97,7 +96,6 @@ QWindowsPixmapCursorCacheKey::QWindowsPixmapCursorCacheKey(const QCursor &c)
     as do the Window manager frames (resize/move handles).
 
     \internal
-    \ingroup qt-lighthouse-win
     \sa QWindowsWindowCursor
 */
 
@@ -816,7 +814,6 @@ HCURSOR QWindowsCursor::hCursor(const QCursor &c) const
      cursor handle resource.
 
     \internal
-    \ingroup qt-lighthouse-win
     \sa QWindowsCursor
 */
 
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index b038e196893..37115d5c6ed 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -128,7 +128,6 @@ namespace QWindowsDialogs
     remove all those messages (usually 1) and post the last one with a
     reset button state.
 
-    \ingroup qt-lighthouse-win
 */
 
 void eatMouseMove()
@@ -171,7 +170,6 @@ void eatMouseMove()
 
     \sa QWindowsDialogHelperBase
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeDialogBase : public QObject
@@ -211,7 +209,6 @@ private:
 
     \sa QWindowsDialogThread, QWindowsNativeDialogBase
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 template <class BaseClass>
@@ -265,7 +262,6 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase<BaseClass>::ensureNativeDialo
 
     \sa QWindowsDialogHelperBase
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsDialogThread : public QThread
@@ -406,7 +402,6 @@ void QWindowsDialogHelperBase<BaseClass>::exec()
     does not reliably work. Provides thread-safe setters (for the non-modal case).
 
     \internal
-    \ingroup qt-lighthouse-win
     \sa QFileDialogOptions
 */
 
@@ -500,7 +495,6 @@ inline void QWindowsFileDialogSharedData::fromOptions(const QSharedPointer<QFile
 
     \sa QWindowsNativeFileDialogBase, QWindowsFileDialogHelper
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeFileDialogBase;
@@ -546,7 +540,6 @@ IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFi
 
     \sa QWindowsNativeFileDialogBase
     \internal
-    \ingroup qt-lighthouse-win
 */
 class QWindowsShellItem
 {
@@ -789,7 +782,6 @@ QDebug operator<<(QDebug d, IShellItem *i)
 
     \sa QWindowsNativeFileDialogEventHandler, QWindowsFileDialogHelper
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeFileDialogBase : public QWindowsNativeDialogBase
@@ -1295,7 +1287,6 @@ HRESULT QWindowsNativeFileDialogEventHandler::OnFileOk(IFileDialog *)
     Implements single-selection methods.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeSaveFileDialog : public QWindowsNativeFileDialogBase
@@ -1372,7 +1363,6 @@ QList<QUrl> QWindowsNativeSaveFileDialog::selectedFiles() const
     Implements multi-selection methods.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeOpenFileDialog : public QWindowsNativeFileDialogBase
@@ -1545,7 +1535,6 @@ QWindowsNativeFileDialogBase *QWindowsNativeFileDialogBase::create(QFileDialogOp
     but only on QQuickWindows, which do not have a fallback.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
@@ -1681,7 +1670,6 @@ QString QWindowsFileDialogHelper::selectedNameFilter() const
     \internal
     \sa QWindowsXpFileDialogHelper
 
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsXpNativeFileDialog : public QWindowsNativeDialogBase
@@ -1929,7 +1917,6 @@ QList<QUrl> QWindowsXpNativeFileDialog::execFileNames(HWND owner, int *selectedF
 
     \sa QWindowsXpNativeFileDialog
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
@@ -2006,7 +1993,6 @@ QString QWindowsXpFileDialogHelper::selectedNameFilter() const
     \sa QWindowsColorDialogHelper
     \sa #define USE_NATIVE_COLOR_DIALOG
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 using SharedPointerColor = QSharedPointer<QColor>;
@@ -2086,7 +2072,6 @@ void QWindowsNativeColorDialog::doExec(HWND owner)
     \sa #define USE_NATIVE_COLOR_DIALOG
     \sa QWindowsNativeColorDialog
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsColorDialogHelper : public QWindowsDialogHelperBase<QPlatformColorDialogHelper>
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
index 3e4c93d47a4..bb1e1345dc3 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@@ -75,7 +75,6 @@ QT_BEGIN_NAMESPACE
 
     \sa QWindowsOleDropSource
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsDragCursorWindow : public QRasterWindow
@@ -135,7 +134,6 @@ void QWindowsDragCursorWindow::setPixmap(const QPixmap &p)
 
     \sa QWindowsDrag
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 IDataObject *QWindowsDropMimeData::retrieveDataObject() const
@@ -217,7 +215,6 @@ static Qt::MouseButtons lastButtons = Qt::NoButton;
 
     \sa QWindowsDrag
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsOleDropSource : public QWindowsComBase<IDropSource>
@@ -485,7 +482,6 @@ QWindowsOleDropSource::GiveFeedback(DWORD dwEffect)
 
     \sa QWindowsDrag
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsOleDropTarget::QWindowsOleDropTarget(QWindow *w) : m_window(w)
@@ -659,7 +655,6 @@ QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState,
     \class QWindowsDrag
     \brief Windows drag implementation.
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 bool QWindowsDrag::m_canceled = false;
diff --git a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp b/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
index c9dd1c7c177..a06a14a9802 100644
--- a/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
+++ b/src/plugins/platforms/windows/qwindowsdropdataobject.cpp
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
     (instead of creating local hyperlinks).
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsDropDataObject::QWindowsDropDataObject(QMimeData *mimeData) :
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
index 76baa93d98c..4ae087dfaa6 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
@@ -63,7 +63,6 @@ QT_BEGIN_NAMESPACE
     there is no need to differentiate between dynamic or Angle-only builds in here.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsLibEGL QWindowsEGLStaticContext::libEGL;
@@ -376,7 +375,6 @@ QSurfaceFormat QWindowsEGLStaticContext::formatFromConfig(EGLDisplay display, EG
     \endlist
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index f5d0a8780a9..6fa5a8a2b3b 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -858,7 +858,6 @@ static inline QOpenGLContextData createDummyWindowOpenGLContextData()
     context and to apply to a QSurfaceFormat.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsOpenGLContextFormat QWindowsOpenGLContextFormat::current()
@@ -913,7 +912,6 @@ void QWindowsOpenGLContextFormat::apply(QSurfaceFormat *format) const
     is a current GL context.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QOpenGLTemporaryContext
@@ -946,7 +944,6 @@ QOpenGLTemporaryContext::~QOpenGLTemporaryContext()
 /*!
     \class QWindowsOpenGLAdditionalFormat
     \brief Additional format information that is not in QSurfaceFormat
-    \ingroup qt-lighthouse-win
 */
 
 /*!
@@ -964,7 +961,6 @@ QOpenGLTemporaryContext::~QOpenGLTemporaryContext()
 
     \sa QWindowsGLContext
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 #define SAMPLE_BUFFER_EXTENSION "GL_ARB_multisample"
@@ -1051,7 +1047,6 @@ QOpenGLStaticContext *QOpenGLStaticContext::create(bool softwareRendering)
     QOpenGLContextData and are released in doneCurrent().
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsGLContext::QWindowsGLContext(QOpenGLStaticContext *staticContext,
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
index 7c4ddbd2a13..03be0b94510 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
@@ -160,7 +160,6 @@ Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id); // from qlocale_win.cpp
     needs to be checked (mouse grab might interfere with candidate window).
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 94274ffcd74..f4bf58ee310 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -128,7 +128,6 @@ QT_BEGIN_NAMESPACE
     QWindowsUser32DLL and QWindowsShell32DLL. All function pointers should go to
     these structs to avoid lookups in several places.
 
-    \ingroup qt-lighthouse-win
 */
 
 struct QWindowsIntegrationPrivate
diff --git a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
index 44b7523fa69..ad3f02f83b2 100644
--- a/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
+++ b/src/plugins/platforms/windows/qwindowsinternalmimedata.cpp
@@ -60,7 +60,6 @@
 
     \sa QInternalMimeData, QWindowsMime, QWindowsMimeConverter
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 bool QWindowsInternalMimeData::hasFormat_sys(const QString &mime) const
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index e3edf7e81e5..4f46c05f7af 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -88,7 +88,6 @@ QT_BEGIN_NAMESPACE
     \class QWindowsKeyMapper
     \brief Translates Windows keys to QWindowSystemInterface events.
     \internal
-    \ingroup qt-lighthouse-win
 
     In addition, handles some special keys to display system menus, etc.
     The code originates from \c qkeymapper_win.cpp.
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index d29830b3947..5f21bdfa33e 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
     Qt Widgets, either the containers or the items might be deleted first.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 static uint nextId = 1;
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index fe9e1fe31f2..6733ab9fed1 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -447,7 +447,6 @@ QDebug operator<<(QDebug d, IDataObject *dataObj)
     \class QWindowsMime
     \brief The QWindowsMime class maps open-standard MIME to Window Clipboard formats.
     \internal
-    \ingroup qt-lighthouse-win
 
     Qt's drag-and-drop and clipboard facilities use the MIME standard.
     On X11, this maps trivially to the Xdnd protocol, but on Windows
@@ -1495,7 +1494,6 @@ QString QLastResortMimes::mimeForFormat(const FORMATETC &formatetc) const
     \class QWindowsMimeConverter
     \brief Manages the list of QWindowsMime instances.
     \internal
-    \ingroup qt-lighthouse-win
     \sa QWindowsMime
 */
 
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
index b776efc942f..1b2d831268a 100644
--- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
@@ -145,7 +145,6 @@ static inline QTouchDevice *createTouchDevice()
     Dispatches mouse and touch events. Separate for code cleanliness.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsMouseHandler::QWindowsMouseHandler() = default;
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h
index 90ba7a44c97..387f65ae8ff 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.h
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h
@@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
     \endlist
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 class QWindowsNativeInterface : public QPlatformNativeInterface
diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp
index f3450e28062..0a7fef6c30f 100644
--- a/src/plugins/platforms/windows/qwindowsole.cpp
+++ b/src/plugins/platforms/windows/qwindowsole.cpp
@@ -70,7 +70,6 @@ QT_BEGIN_NAMESPACE
    \endlist
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsOleDataObject::QWindowsOleDataObject(QMimeData *mimeData) :
@@ -228,7 +227,6 @@ QWindowsOleDataObject::EnumDAdvise(LPENUMSTATDATA FAR*)
     \class QWindowsOleEnumFmtEtc
     \brief Enumerates the FORMATETC structures supported by QWindowsOleDataObject.
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsOleEnumFmtEtc::QWindowsOleEnumFmtEtc(const QVector<FORMATETC> &fmtetcs)
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
index c7a0c2e62e9..9a4f8d152c3 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -171,7 +171,6 @@ static QDebug operator<<(QDebug dbg, const QWindowsScreenData &d)
     \brief Windows screen.
     \sa QWindowsScreenManager
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsScreen::QWindowsScreen(const QWindowsScreenData &data) :
@@ -432,7 +431,6 @@ QPlatformScreen::SubpixelAntialiasingType QWindowsScreen::subpixelAntialiasingTy
 
     \sa QWindowsScreen
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsScreenManager::QWindowsScreenManager() = default;
diff --git a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
index d6a5b29a710..def011e4bd4 100644
--- a/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
+++ b/src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
@@ -184,7 +184,6 @@ static inline HWND createTrayIconMessageWindow()
     \brief Windows native system tray icon
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsSystemTrayIcon::QWindowsSystemTrayIcon()
diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
index cd5a78abb6f..287ba931d9b 100644
--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp
+++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp
@@ -173,7 +173,6 @@ QWindowsWinTab32DLL QWindowsTabletSupport::m_winTab32DLL;
     \brief Functions from wintabl32.dll shipped with WACOM tablets used by QWindowsTabletSupport.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 bool QWindowsWinTab32DLL::init()
@@ -205,7 +204,6 @@ bool QWindowsWinTab32DLL::init()
 
     \internal
     \since 5.2
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsTabletSupport::QWindowsTabletSupport(HWND window, HCTX context)
diff --git a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
index ffe2e620695..a31e00c0ace 100644
--- a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
+++ b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
@@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
     to be done by using QWaitCondition/QMutex.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 class QWindowsThreadPoolRunner
 {
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 8191bbb42bd..322eae7a064 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -489,7 +489,6 @@ static QMargins invisibleMargins(QPoint screenPoint)
 
     \sa QWindowCreationContext
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 struct WindowCreationData
@@ -917,7 +916,6 @@ static QSize toNativeSizeConstrained(QSize dip, const QScreen *s)
     into account.
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QMargins QWindowsGeometryHint::frameOnPrimaryScreen(DWORD style, DWORD exStyle)
@@ -1087,7 +1085,6 @@ bool QWindowsGeometryHint::positionIncludesFrame(const QWindow *w)
 
     \since 5.6
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 bool QWindowsBaseWindow::isRtlLayout(HWND hwnd)
@@ -1176,7 +1173,6 @@ QPoint QWindowsBaseWindow::mapFromGlobal(const QPoint &pos) const
     \brief Window wrapping GetDesktopWindow not allowing any manipulation.
     \since 5.6
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 /*!
@@ -1189,7 +1185,6 @@ QPoint QWindowsBaseWindow::mapFromGlobal(const QPoint &pos) const
 
     \since 5.6
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowsForeignWindow::QWindowsForeignWindow(QWindow *window, HWND hwnd)
@@ -1248,7 +1243,6 @@ void QWindowsForeignWindow::setVisible(bool visible)
 
     \sa WindowCreationData, QWindowsContext
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 QWindowCreationContext::QWindowCreationContext(const QWindow *w, const QScreen *s,
@@ -1318,7 +1312,6 @@ void QWindowCreationContext::applyToMinMaxInfo(MINMAXINFO *mmi) const
     \endlist
 
     \internal
-    \ingroup qt-lighthouse-win
 */
 
 const char *QWindowsWindow::embeddedNativeParentHandleProperty = "_q_embedded_native_parent_handle";