summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthew Cattell <matthew.cattell@nokia.com>2009-08-11 13:58:43 (GMT)
committerMatthew Cattell <matthew.cattell@nokia.com>2009-08-11 14:11:08 (GMT)
commit6844dea0cb583a86bc72e7f008720ab76deef040 (patch)
treed4d33754d00f1b2592305be3529762b88b552203 /src
parent1ba7eaafff489d70455404ac394e80a11f5ed5fa (diff)
downloadQt-6844dea0cb583a86bc72e7f008720ab76deef040.zip
Qt-6844dea0cb583a86bc72e7f008720ab76deef040.tar.gz
Qt-6844dea0cb583a86bc72e7f008720ab76deef040.tar.bz2
Frame property for QDateTimeEdit can be set independently of
calendar popup A frame was always drawn around the QDateTimeEdit editor if a popup calendar had been set. QStyleOptionsComboBox options are being set in paintEvent and initialised from the properties of QStyleOptionsSpinBox but were missing the frame bool property. Now, if the user sets a frame on the QDateTimeEdit, this property will be consistent with setFrame() property of the QDateTimeEdit widget.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qdatetimeedit.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index be8eb3f..4c6e875 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -2278,6 +2278,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;