Use qintptr in QWidget::nativeEvent on Qt 6 (#4376)

This commit is contained in:
nerix
2023-02-13 21:45:58 +01:00
committed by GitHub
parent df9836f59e
commit bb0b563a87
5 changed files with 39 additions and 3 deletions
+13
View File
@@ -631,8 +631,13 @@ void BaseWindow::moveIntoDesktopRect(QPoint point)
this->move(point);
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
qintptr *result)
#else
bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
long *result)
#endif
{
#ifdef USEWINSDK
MSG *msg = reinterpret_cast<MSG *>(message);
@@ -830,7 +835,11 @@ bool BaseWindow::handleSHOWWINDOW(MSG *msg)
#endif
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool BaseWindow::handleNCCALCSIZE(MSG *msg, qintptr *result)
#else
bool BaseWindow::handleNCCALCSIZE(MSG *msg, long *result)
#endif
{
#ifdef USEWINSDK
if (this->hasCustomWindowFrame())
@@ -914,7 +923,11 @@ bool BaseWindow::handleMOVE(MSG *msg)
return false;
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool BaseWindow::handleNCHITTEST(MSG *msg, qintptr *result)
#else
bool BaseWindow::handleNCHITTEST(MSG *msg, long *result)
#endif
{
#ifdef USEWINSDK
const LONG border_width = 8; // in pixels