Fixed all Qt6 build issues

2021-01-02 18:06:45 +01:00
parent c8fe4c46dd
commit 018ce2001e
11 changed files with 53 additions and 22 deletions
--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -733,8 +733,11 @@ void CFloatingDockContainer::changeEvent(QEvent *event)


 #ifdef Q_OS_WIN
-//============================================================================
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#else
+bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#endif
 {
 	QWidget::nativeEvent(eventType, message, result);
 	MSG *msg = static_cast<MSG*>(message);