diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-18 13:42:33 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-21 10:47:49 +0800 |
| commit | 298966a44034806089acdb798c8be4d0ae6e74b2 (patch) | |
| tree | 92a05018ec44a4863e30026d0711a0daaa28368d | |
| parent | 52ea04aee1a7bdb8cf9254f9455aaebf5dca7832 (diff) | |
4cb3e8fafec99407b2d8a545fa99968e4891b286 fixed the build with 6.2.0 by
accounting for fb6baf03faf1ffdda5917b9daa9e9ed0f821fa8a, but got the
version check wrong, as versions greater than 6.2.0 but less than 6.3.0
would use the new event API which was only added in 6.3.0.
Task-number: QTEXT-13
Change-Id: I797d66a8e449ef8f36ce58ca9c7e2471881b9ab8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/imports/calendar/qquickmonthgrid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index 519c15c..7668611 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -108,7 +108,7 @@ public: void updatePress(const QPointF &pos); void clearPress(bool clicked); -#if QT_VERSION > QT_VERSION_CHECK(6, 2, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) void handlePress(const QPointF &point, ulong timestamp) override; void handleMove(const QPointF &point, ulong timestamp) override; void handleRelease(const QPointF &point, ulong timestamp) override; @@ -187,7 +187,7 @@ void QQuickMonthGridPrivate::clearPress(bool clicked) pressedItem = nullptr; } -#if QT_VERSION > QT_VERSION_CHECK(6, 2, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) void QQuickMonthGridPrivate::handlePress(const QPointF &point, ulong timestamp) { Q_Q(QQuickMonthGrid); @@ -203,7 +203,7 @@ void QQuickMonthGridPrivate::handlePress(const QPointF &point) pressTimer = q->startTimer(qGuiApp->styleHints()->mousePressAndHoldInterval()); } -#if QT_VERSION > QT_VERSION_CHECK(6, 2, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) void QQuickMonthGridPrivate::handleMove(const QPointF &point, ulong timestamp) { QQuickControlPrivate::handleMove(point, timestamp); @@ -215,7 +215,7 @@ void QQuickMonthGridPrivate::handleMove(const QPointF &point) updatePress(point); } -#if QT_VERSION > QT_VERSION_CHECK(6, 2, 0) +#if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0) void QQuickMonthGridPrivate::handleRelease(const QPointF &point, ulong timestamp) { QQuickControlPrivate::handleRelease(point, timestamp); |