diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-02 12:14:31 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-03 16:14:00 +0200 |
| commit | a15a3fef0b5dae4e83bd94b23dd2418208159d05 (patch) | |
| tree | 189e3aca36995aa9a2b22f837fefc6c476a0506b /src/widgets/widgets/qdatetimeedit_p.h | |
| parent | 0336f08fec906af7e907d07d990a097a9a1d8726 (diff) | |
Fix copy-and-paste bug in QDTEP::getMaximum()
It had a copy of a line from getMinimum().
The results were predictably broken.
Pick-to: 5.15 6.1
Change-Id: I3582edb08696bec4311f43fc426f7e54dc069f53
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit_p.h')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index dd0f6b251c..8414a89805 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -107,7 +107,7 @@ public: if (keyboardTracking) return maximum.toDateTime(); if (spec != Qt::LocalTime) - return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec)); + return QDateTime(QDATETIMEEDIT_DATE_MAX.endOfDay(spec)); return QDateTimeParser::getMaximum(); } QLocale locale() const override { return q_func()->locale(); } |