diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:33:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:33:51 +0200 |
| commit | b2054433516f7161906d45de0971bbc032576ded (patch) | |
| tree | 41622e555a036fa86ac9a585a016e148eaa7f40c /src/widgets/widgets/qdatetimeedit_p.h | |
| parent | c1e4c7d7639b84c0220e3a2ddd455d03c0910893 (diff) | |
| parent | ebec918722a283410624af6df38345b9dfc0b8f8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: Icb486cf8f31ec85d940b2179e8d023fbbc7fd3fa
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit_p.h')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index c05e7d9b48..453ac36d15 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -52,6 +52,7 @@ // #include <QtWidgets/private/qtwidgetsglobal_p.h> +#include <QtCore/qcalendar.h> #include "QtWidgets/qcalendarwidget.h" #include "QtWidgets/qspinbox.h" #include "QtWidgets/qtoolbutton.h" @@ -70,7 +71,6 @@ class Q_AUTOTEST_EXPORT QDateTimeEditPrivate : public QAbstractSpinBoxPrivate, p Q_DECLARE_PUBLIC(QDateTimeEdit) public: QDateTimeEditPrivate(); - ~QDateTimeEditPrivate(); void init(const QVariant &var); void readLocaleSettings(); @@ -145,7 +145,8 @@ class QCalendarPopup : public QWidget { Q_OBJECT public: - explicit QCalendarPopup(QWidget *parent = nullptr, QCalendarWidget *cw = nullptr); + explicit QCalendarPopup(QWidget *parent = nullptr, QCalendarWidget *cw = nullptr, + QCalendar ca = QCalendar()); QDate selectedDate() { return verifyCalendarInstance()->selectedDate(); } void setDate(const QDate &date); void setDateRange(const QDate &min, const QDate &max); @@ -174,6 +175,7 @@ private: QPointer<QCalendarWidget> calendar; QDate oldDate; bool dateChanged; + QCalendar calendarSystem; }; QT_END_NAMESPACE |