summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorjahonkon <jani.honkonen@digia.com>2011-11-11 09:07:42 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-11 09:18:24 (GMT)
commitb0c09896a239197411027e773214a2635744695c (patch)
treedd94a5e8525a4bfe1bd60bab1924b6fdd0de8510 /src/gui/widgets
parentb1998f4f59c3b10700963b2d13a17a0cc77ef665 (diff)
downloadQt-b0c09896a239197411027e773214a2635744695c.zip
Qt-b0c09896a239197411027e773214a2635744695c.tar.gz
Qt-b0c09896a239197411027e773214a2635744695c.tar.bz2
Fix QDateEdit calendar pop-up having wrong date
When the calendar pops up it moves the date to maximum instead of keeping the current date. Problem was caused by QCalendarPopup signalling date change to QDateTimeEdit during internal date synchronization from QDateTimeEdit to QCalendarPopup. Task-number: QTBUG-11422 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qdatetimeedit.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index d9ff8a6..62c6e20 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -2532,8 +2532,10 @@ void QDateTimeEditPrivate::syncCalendarWidget()
{
Q_Q(QDateTimeEdit);
if (monthCalendar) {
+ const bool sb = monthCalendar->blockSignals(true);
monthCalendar->setDateRange(q->minimumDate(), q->maximumDate());
monthCalendar->setDate(q->date());
+ monthCalendar->blockSignals(sb);
}
}