summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/main.cpp8
-rw-r--r--src/plugins/platforms/windows/qwindowsbackingstore.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowsclipboard.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.cpp10
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.h2
-rw-r--r--src/plugins/platforms/windows/qwindowscursor.cpp3
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp15
-rw-r--r--src/plugins/platforms/windows/qwindowsdrag.cpp5
-rw-r--r--src/plugins/platforms/windows/qwindowsdropdataobject.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowseglcontext.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.cpp5
-rw-r--r--src/plugins/platforms/windows/qwindowsinputcontext.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowsinternalmimedata.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowskeymapper.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowsmenu.cpp12
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsmousehandler.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowsnativeinterface.h1
-rw-r--r--src/plugins/platforms/windows/qwindowsole.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsscreen.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowssystemtrayicon.cpp1
-rw-r--r--src/plugins/platforms/windows/qwindowstabletsupport.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsthreadpoolrunner.h1
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp19
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.h1
-rw-r--r--src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp1
-rw-r--r--src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp6
28 files changed, 28 insertions, 81 deletions
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp
index 1929f800a4..94d8470ab1 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 bd7bdc55d1..e3939ca2d7 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 efcb0b6e6e..b23904e978 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 b8b54d9b86..c7b85187a3 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -186,7 +186,6 @@ static bool enableNonClientDpiScaling(HWND hwnd)
\sa QWindowsShell32DLL
\internal
- \ingroup qt-lighthouse-win
*/
void QWindowsUser32DLL::init()
@@ -252,7 +251,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;
@@ -1007,6 +1005,13 @@ QByteArray QWindowsContext::comErrorString(HRESULT hr)
return result;
}
+void QWindowsContext::forceNcCalcSize(HWND hwnd)
+{
+ // Force WM_NCCALCSIZE to adjust margin
+ SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
+ SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+}
+
bool QWindowsContext::systemParametersInfo(unsigned action, unsigned param, void *out,
unsigned dpi)
{
@@ -1667,7 +1672,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/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 1831ac6ec0..c89b8b91f4 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -249,6 +249,8 @@ public:
bool asyncExpose() const;
void setAsyncExpose(bool value);
+ static void forceNcCalcSize(HWND hwnd);
+
static bool systemParametersInfo(unsigned action, unsigned param, void *out, unsigned dpi = 0);
static bool systemParametersInfoForScreen(unsigned action, unsigned param, void *out,
const QPlatformScreen *screen = nullptr);
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 19de3d5939..338bb9ff8f 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 ccc809413e..dbd7d557db 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -130,7 +130,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()
@@ -173,7 +172,6 @@ void eatMouseMove()
\sa QWindowsDialogHelperBase
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsNativeDialogBase : public QObject
@@ -213,7 +211,6 @@ private:
\sa QWindowsDialogThread, QWindowsNativeDialogBase
\internal
- \ingroup qt-lighthouse-win
*/
template <class BaseClass>
@@ -267,7 +264,6 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase<BaseClass>::ensureNativeDialo
\sa QWindowsDialogHelperBase
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsDialogThread : public QThread
@@ -408,7 +404,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
*/
@@ -502,7 +497,6 @@ inline void QWindowsFileDialogSharedData::fromOptions(const QSharedPointer<QFile
\sa QWindowsNativeFileDialogBase, QWindowsFileDialogHelper
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsNativeFileDialogBase;
@@ -548,7 +542,6 @@ IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFi
\sa QWindowsNativeFileDialogBase
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsShellItem
{
@@ -791,7 +784,6 @@ QDebug operator<<(QDebug d, IShellItem *i)
\sa QWindowsNativeFileDialogEventHandler, QWindowsFileDialogHelper
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsNativeFileDialogBase : public QWindowsNativeDialogBase
@@ -1304,7 +1296,6 @@ HRESULT QWindowsNativeFileDialogEventHandler::OnFileOk(IFileDialog *)
Implements single-selection methods.
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsNativeSaveFileDialog : public QWindowsNativeFileDialogBase
@@ -1381,7 +1372,6 @@ QList<QUrl> QWindowsNativeSaveFileDialog::selectedFiles() const
Implements multi-selection methods.
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsNativeOpenFileDialog : public QWindowsNativeFileDialogBase
@@ -1554,7 +1544,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>
@@ -1690,7 +1679,6 @@ QString QWindowsFileDialogHelper::selectedNameFilter() const
\internal
\sa QWindowsXpFileDialogHelper
- \ingroup qt-lighthouse-win
*/
class QWindowsXpNativeFileDialog : public QWindowsNativeDialogBase
@@ -1938,7 +1926,6 @@ QList<QUrl> QWindowsXpNativeFileDialog::execFileNames(HWND owner, int *selectedF
\sa QWindowsXpNativeFileDialog
\internal
- \ingroup qt-lighthouse-win
*/
class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
@@ -2015,7 +2002,6 @@ QString QWindowsXpFileDialogHelper::selectedNameFilter() const
\sa QWindowsColorDialogHelper
\sa #define USE_NATIVE_COLOR_DIALOG
\internal
- \ingroup qt-lighthouse-win
*/
using SharedPointerColor = QSharedPointer<QColor>;
@@ -2095,7 +2081,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 3e4c93d47a..bb1e1345dc 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 c9dd1c7c17..a06a14a980 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 76baa93d98..4ae087dfaa 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 7431f52e8a..b2ac2e3476 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 7c4ddbd2a1..03be0b9451 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 8963f2ad17..977b5903a5 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -131,7 +131,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 44b7523fa6..ad3f02f83b 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 e3edf7e81e..4f46c05f7a 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 7c3e87eec1..5f21bdfa33 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;
@@ -794,20 +793,13 @@ QWindowsMenuBar *QWindowsMenuBar::menuBarOf(const QWindow *notYetCreatedWindow)
? qobject_cast<QWindowsMenuBar *>(menuBarV.value<QObject *>()) : nullptr;
}
-static inline void forceNcCalcSize(HWND hwnd)
-{
- // Force WM_NCCALCSIZE to adjust margin: Does not appear to work?
- SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
- SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
-}
-
void QWindowsMenuBar::install(QWindowsWindow *window)
{
const HWND hwnd = window->handle();
const BOOL result = SetMenu(hwnd, m_hMenuBar);
if (result) {
window->setMenuBar(this);
- forceNcCalcSize(hwnd);
+ QWindowsContext::forceNcCalcSize(hwnd);
}
}
@@ -817,7 +809,7 @@ void QWindowsMenuBar::removeFromWindow()
const HWND hwnd = window->handle();
SetMenu(hwnd, nullptr);
window->setMenuBar(nullptr);
- forceNcCalcSize(hwnd);
+ QWindowsContext::forceNcCalcSize(hwnd);
}
}
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 9bc79a10f9..f8cc5e76ff 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -450,7 +450,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
@@ -1498,7 +1497,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 b776efc942..1b2d831268 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 90ba7a44c9..387f65ae8f 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 f3450e2806..0a7fef6c30 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 c7a0c2e62e..9a4f8d152c 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 d6a5b29a71..def011e4bd 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 cd5a78abb6..287ba931d9 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 ffe2e62069..a31e00c0ac 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 3dfffa6de6..2b5f0b6075 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";
@@ -2442,7 +2435,17 @@ void QWindowsWindow::setFullFrameMargins(const QMargins &newMargins)
void QWindowsWindow::updateFullFrameMargins()
{
- // Normally obtained from WM_NCCALCSIZE
+ // QTBUG-82580: If a native menu is present, force a WM_NCCALCSIZE.
+ if (GetMenu(m_data.hwnd))
+ QWindowsContext::forceNcCalcSize(m_data.hwnd);
+ else
+ calculateFullFrameMargins();
+}
+
+void QWindowsWindow::calculateFullFrameMargins()
+{
+ // Normally obtained from WM_NCCALCSIZE. This calculation only works
+ // when no native menu is present.
const auto systemMargins = testFlag(DisableNonClientScaling)
? QWindowsGeometryHint::frameOnPrimaryScreen(m_data.hwnd)
: frameMargins_sys();
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index e1f7908687..b35081d41d 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -373,6 +373,7 @@ private:
void handleWindowStateChange(Qt::WindowStates state);
inline void destroyIcon();
void fireExpose(const QRegion &region, bool force=false);
+ void calculateFullFrameMargins();
mutable QWindowsWindowData m_data;
QPointer<QWindowsMenuBar> m_menuBar;
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
index 32a57473ad..fef5346eaf 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaaccessibility.cpp
@@ -105,6 +105,7 @@ static QString alertSound(const QObject *object)
case Critical:
return QStringLiteral("SystemHand");
}
+ return QString();
}
return QStringLiteral("SystemAsterisk");
}
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
index 59360616a1..3962d2d27f 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiamainprovider.cpp
@@ -305,11 +305,9 @@ HRESULT QWindowsUiaMainProvider::GetPatternProvider(PATTERNID idPattern, IUnknow
}
break;
case UIA_TogglePatternId:
- // Checkbox controls.
- if (accessible->role() == QAccessible::CheckBox
- || (accessible->role() == QAccessible::MenuItem && accessible->state().checkable)) {
+ // Checkboxes and other checkable controls.
+ if (accessible->state().checkable)
*pRetVal = new QWindowsUiaToggleProvider(id());
- }
break;
case UIA_SelectionPatternId:
// Lists of items.