diff options
author | Matthew Cattell <matthew.cattell@nokia.com> | 2009-08-11 14:38:34 (GMT) |
---|---|---|
committer | Matthew Cattell <matthew.cattell@nokia.com> | 2009-08-11 14:38:34 (GMT) |
commit | 01cb98e141d201d7f7efd83dabefc7938759694b (patch) | |
tree | 60cc67f8ec03f3e5bec52b8ab950016135834be1 /src | |
parent | c6030230d0af230cfcf084cc7bc16515c863c37b (diff) | |
download | Qt-01cb98e141d201d7f7efd83dabefc7938759694b.zip Qt-01cb98e141d201d7f7efd83dabefc7938759694b.tar.gz Qt-01cb98e141d201d7f7efd83dabefc7938759694b.tar.bz2 |
QDateTimeEdit: setFrame property is respected when a popup calendar
has been set.
The hasFrame() or frame property of the QStyleOptionSpinBox was not being copiedthrough to the QStyleOptionComboBox inside the paintEvent method if a
calendarPopup had been enabled.
Task-number:259510
Reviewed-by:Jens Bache-Wiig
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/widgets/qdatetimeedit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index cb76876..96d5619 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -2270,6 +2270,7 @@ void QDateTimeEdit::paintEvent(QPaintEvent *event) optCombo.init(this); optCombo.editable = true; + optCombo.frame = opt.frame; optCombo.subControls = opt.subControls; optCombo.activeSubControls = opt.activeSubControls; optCombo.state = opt.state; |