Merge pull request #2209 from ts-korhonen/fix-win-qt6

qt: fix Qt6 windows build
2022-03-09 13:43:34 +01:00
parent 130ed17b1c 35d6c68488
commit 89ca824b1d
2 changed files with 2 additions and 3 deletions
--- a/src/qt/qt_winrawinputfilter.cpp
+++ b/src/qt/qt_winrawinputfilter.cpp
@@ -110,7 +110,7 @@ WindowsRawInputFilter::~WindowsRawInputFilter()
    RegisterRawInputDevices(rid, 2, sizeof(rid[0]));
 }

-bool WindowsRawInputFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
+bool WindowsRawInputFilter::nativeEventFilter(const QByteArray &eventType, void *message, result_t *result)
 {
    if (eventType == "windows_generic_MSG")
    {
--- a/src/qt/qt_winrawinputfilter.hpp
+++ b/src/qt/qt_winrawinputfilter.hpp
@@ -40,13 +40,12 @@

 #include <memory>

-#if QT_VERSION_MAJOR >= 6
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #define result_t qintptr
 #else
 #define result_t long
 #endif

-
 class WindowsRawInputFilter : public QObject, public QAbstractNativeEventFilter
 {
    Q_OBJECT