diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 01:00:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-23 01:00:36 +0200 |
| commit | 7f895553ace11d8afe5ae280e3c9a68264a6ea87 (patch) | |
| tree | 8e0af6e7f95949fab8a711ebd04bc20977e2c730 /src/widgets/widgets/qdatetimeedit_p.h | |
| parent | c6128fc67cda7f14432203b1ec7408a527053bdb (diff) | |
| parent | e0a78bf4501c3102578d2de02c95418fa5bb4611 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaa439ba7dff19a17e3716b3d30f49f60fa6e38f8
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit_p.h')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index ac9bd4401a..dd0f6b251c 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -98,12 +98,16 @@ public: { if (keyboardTracking) return minimum.toDateTime(); + if (spec != Qt::LocalTime) + return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec)); return QDateTimeParser::getMinimum(); } QDateTime getMaximum() const override { if (keyboardTracking) return maximum.toDateTime(); + if (spec != Qt::LocalTime) + return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec)); return QDateTimeParser::getMaximum(); } QLocale locale() const override { return q_func()->locale(); } @@ -148,6 +152,8 @@ public: #ifdef QT_KEYPAD_NAVIGATION bool focusOnButton; #endif + + Qt::TimeSpec spec = Qt::LocalTime; }; |