summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-09-03 13:16:21 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-09-04 10:55:59 (GMT)
commit69fb25cebb9e74b018026d3ab9aa75fcc959cfc5 (patch)
treed7bc11563cdfe952a932e60fd190ed36328b6b37 /src
parent7122c7ceb38a803afe17956f3d7fde897f298cac (diff)
downloadQt-69fb25cebb9e74b018026d3ab9aa75fcc959cfc5.zip
Qt-69fb25cebb9e74b018026d3ab9aa75fcc959cfc5.tar.gz
Qt-69fb25cebb9e74b018026d3ab9aa75fcc959cfc5.tar.bz2
Fix ./tst_qdatetimeedit::task118867
Before the QLineEdit change, the QLineEdit::displayText used to return the currently entered text when we call validate() on the validator. Now, the displayText is set _after_ the validation. Hence, the QDateTimeEdit::validate did not had access to the real text. Reviewed-by: Thierry
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qdatetimeedit_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qdatetimeedit_p.h b/src/gui/widgets/qdatetimeedit_p.h
index 7e1c24d..689b508 100644
--- a/src/gui/widgets/qdatetimeedit_p.h
+++ b/src/gui/widgets/qdatetimeedit_p.h
@@ -89,7 +89,7 @@ public:
QDateTime validateAndInterpret(QString &input, int &, QValidator::State &state,
bool fixup = false) const;
void clearSection(int index);
- virtual QString displayText() const { return edit->displayText(); } // this is from QDateTimeParser
+ virtual QString displayText() const { return edit->text(); } // this is from QDateTimeParser
int absoluteIndex(QDateTimeEdit::Section s, int index) const;
int absoluteIndex(const SectionNode &s) const;