diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-11 09:29:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-11 09:29:51 (GMT) |
| commit | 2b22c063bebbc545121e53e0728211dbd02cb337 (patch) | |
| tree | d40645da012fc80ea53ee2279b0364bdf36dbbd8 | |
| parent | cae83d7feacb874923ce86726318e43a1284aa63 (diff) | |
| parent | b0c09896a239197411027e773214a2635744695c (diff) | |
| download | Qt-2b22c063bebbc545121e53e0728211dbd02cb337.zip Qt-2b22c063bebbc545121e53e0728211dbd02cb337.tar.gz Qt-2b22c063bebbc545121e53e0728211dbd02cb337.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QDateEdit calendar pop-up having wrong date
| -rw-r--r-- | src/gui/widgets/qdatetimeedit.cpp | 2 |
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); } } |