diff options
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit.cpp')
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 053b184226..fca81bec48 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -42,6 +42,7 @@ #include <qapplication.h> #include <qdatetimeedit.h> #include <qdesktopwidget.h> +#include <private/qdesktopwidget_p.h> #include <qdebug.h> #include <qevent.h> #include <qlineedit.h> @@ -362,7 +363,7 @@ void QDateTimeEdit::setMinimumDateTime(const QDateTime &dt) clearMaximumDateTime(). By default, this property contains a date that refers to 31 December, - 7999 and a time of 23:59:59 and 999 milliseconds. + 9999 and a time of 23:59:59 and 999 milliseconds. \sa minimumDateTime(), minimumTime(), maximumTime(), minimumDate(), maximumDate(), setDateTimeRange(), setDateRange(), setTimeRange(), @@ -465,7 +466,7 @@ void QDateTimeEdit::clearMinimumDate() necessary to ensure that the range remains valid. If the date is not a valid QDate object, this function does nothing. - By default, this property contains a date that refers to December 31, 7999. + By default, this property contains a date that refers to December 31, 9999. \sa minimumDate, minimumTime, maximumTime, setDateRange() */ @@ -965,12 +966,12 @@ QSize QDateTimeEdit::sizeHint() const int w = 0; QString s; s = d->textFromValue(d->minimum) + QLatin1Char(' '); - w = qMax<int>(w, fm.width(s)); + w = qMax<int>(w, fm.horizontalAdvance(s)); s = d->textFromValue(d->maximum) + QLatin1Char(' '); - w = qMax<int>(w, fm.width(s)); + w = qMax<int>(w, fm.horizontalAdvance(s)); if (d->specialValueText.size()) { s = d->specialValueText; - w = qMax<int>(w, fm.width(s)); + w = qMax<int>(w, fm.horizontalAdvance(s)); } w += 2; // cursor blinking space @@ -1073,7 +1074,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) //hide cursor d->edit->d_func()->setCursorVisible(false); - d->edit->d_func()->control->setCursorBlinkPeriod(0); + d->edit->d_func()->control->setBlinkingCursorEnabled(false); d->setSelected(0); } } @@ -1094,7 +1095,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) //hide cursor d->edit->d_func()->setCursorVisible(false); - d->edit->d_func()->control->setCursorBlinkPeriod(0); + d->edit->d_func()->control->setBlinkingCursorEnabled(false); d->setSelected(0); oldCurrent = 0; } @@ -1128,7 +1129,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event) } #endif } - // else fall through + Q_FALLTHROUGH(); case Qt::Key_Backtab: case Qt::Key_Tab: { event->accept(); @@ -1921,6 +1922,7 @@ QDateTime QDateTimeEditPrivate::validateAndInterpret(QString &input, int &positi } StateNode tmp = parse(input, position, value.toDateTime(), fixup); input = tmp.input; + position += tmp.padded; state = QValidator::State(int(tmp.state)); if (state == QValidator::Acceptable) { if (tmp.conflicts && conflictGuard != tmp.value) { @@ -2515,7 +2517,7 @@ void QDateTimeEditPrivate::positionCalendarPopup() pos = q->mapToGlobal(pos); pos2 = q->mapToGlobal(pos2); QSize size = monthCalendar->sizeHint(); - QRect screen = QApplication::desktop()->availableGeometry(pos); + QRect screen = QDesktopWidgetPrivate::availableGeometry(pos); //handle popup falling "off screen" if (q->layoutDirection() == Qt::RightToLeft) { pos.setX(pos.x()-size.width()); |