summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Cattell <matthew.cattell@nokia.com>2009-08-11 14:32:32 (GMT)
committerMatthew Cattell <matthew.cattell@nokia.com>2009-08-11 14:32:32 (GMT)
commit39accaec06629da15c073859660fd94c78f1b261 (patch)
tree4f4b1ef0199571b2e0d28d6b7e30793c9f6a50ca
parent6844dea0cb583a86bc72e7f008720ab76deef040 (diff)
downloadQt-39accaec06629da15c073859660fd94c78f1b261.zip
Qt-39accaec06629da15c073859660fd94c78f1b261.tar.gz
Qt-39accaec06629da15c073859660fd94c78f1b261.tar.bz2
Revert "Frame property for QDateTimeEdit can be set independently of"
This reverts commit 6844dea0cb583a86bc72e7f008720ab76deef040. added to wrong branch. should be in 4.6 but this was added to 4.5
-rw-r--r--src/gui/widgets/qdatetimeedit.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 4c6e875..be8eb3f 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -2278,7 +2278,6 @@ 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;