summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjahonkon <jani.honkonen@digia.com>2011-11-11 10:07:42 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-14 10:28:19 +0100
commitad20e965d731164504521a7dac91f3e40e3455d8 (patch)
treecc640050e9933685e41f2bbfde9719d3d914e37e
parent0572b972d88cbfa85a2697bfc2df88a177457745 (diff)
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> (cherry picked from commit b0c09896a239197411027e773214a2635744695c) Change-Id: Ib0c09896a239197411027e773214a2635744695c
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 02d62c87cc..f6b52658c7 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/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);
}
}