diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-22 12:31:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-25 10:07:58 +0000 |
| commit | f76f3a0892b341b3cc94c5bfb282bb1d86ecf7e6 (patch) | |
| tree | db3b0b07512b13d5ed951ed2993c8af277a807b2 /src | |
| parent | 123329563e4b9b0cca81f52615f3b4afe7c304ba (diff) | |
Fix type of the out parameter "result" of the native event filters
Task-number: QTBUG-72968
Change-Id: Icd05b0c55dca2d585e93a8b2a4214f244ee6b4f4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/winextras/qwineventfilter.cpp | 4 | ||||
| -rw-r--r-- | src/winextras/qwineventfilter_p.h | 6 | ||||
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 4 | ||||
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar_p.h | 6 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index be9add4..e9596d9 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -63,7 +63,11 @@ QWinEventFilter::~QWinEventFilter() instance = 0; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { MSG *msg = static_cast<MSG *>(message); bool filterOut = false; diff --git a/src/winextras/qwineventfilter_p.h b/src/winextras/qwineventfilter_p.h index 12b9d58..ad37177 100644 --- a/src/winextras/qwineventfilter_p.h +++ b/src/winextras/qwineventfilter_p.h @@ -64,7 +64,11 @@ class Q_WINEXTRAS_EXPORT QWinEventFilter : public QAbstractNativeEventFilter public: QWinEventFilter(); ~QWinEventFilter(); - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif static void setup(); diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 3aa39b6..de65ff0 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -543,7 +543,11 @@ bool QWinThumbnailToolBarPrivate::eventFilter(QObject *object, QEvent *event) return QObject::eventFilter(object, event); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, qintptr *result) +#else bool QWinThumbnailToolBarPrivate::nativeEventFilter(const QByteArray &, void *message, long *result) +#endif { const MSG *msg = static_cast<const MSG *>(message); if (handle() != msg->hwnd) diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h index 38d210b..6639d09 100644 --- a/src/winextras/qwinthumbnailtoolbar_p.h +++ b/src/winextras/qwinthumbnailtoolbar_p.h @@ -95,7 +95,11 @@ public: void _q_scheduleUpdate(); bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override; +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; +#endif static void initButtons(THUMBBUTTON *buttons); static int makeNativeButtonFlags(const QWinThumbnailToolButton *button); |