diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-22 11:20:31 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-22 16:19:48 +0000 |
| commit | 3b38c73c7ffa71c00c172cf0e05742835a304300 (patch) | |
| tree | d08876d849877ec6f90efd6835433deb1bace1eb /src/testlib/qbenchmarkevent.cpp | |
| parent | e8bde992e073072e795cdb2d4fa5d36089953645 (diff) | |
Widen out parameter "result" of the native event filters for Qt 6
LRESULT on Windows 64 is a 64bit type, adapt filter functions of
QAbstractNativeEventFilter and QAbstractEventDispatcher accordingly.
Fixes: QTBUG-72968
Change-Id: Ie53193e355f0b8e9bd59fa377f43e2b4664a2ded
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qbenchmarkevent.cpp')
| -rw-r--r-- | src/testlib/qbenchmarkevent.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index f696f8b1eb..a8270219e4 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -96,7 +96,11 @@ QTest::QBenchmarkMetric QBenchmarkEvent::metricType() } // This could be done in a much better way, this is just the beginning. +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) +#else bool QBenchmarkEvent::nativeEventFilter(const QByteArray &eventType, void *message, long *result) +#endif { Q_UNUSED(eventType); Q_UNUSED(message); |