diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-09-01 08:19:57 (GMT) |
| commit | 22fe21e22cf3a8aedea57e419034ed3245b10c0d (patch) | |
| tree | d846ea9295f357204019f9b56286a5903da04819 /src/gui/widgets | |
| parent | 1ec0155c191e2818f56815ee4ddbf5d8982f1267 (diff) | |
| parent | 7b6028276cf5de1ffd5ab8d6dede7cca12e906fd (diff) | |
| download | Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.zip Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.gz Qt-22fe21e22cf3a8aedea57e419034ed3245b10c0d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qdatetimeedit.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 7a61dc7..bd6c577 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -248,7 +248,7 @@ void QDateTimeEdit::setDateTime(const QDateTime &datetime) /*! \property QDateTimeEdit::date - \brief the QDate that is set in the QDateTimeEdit + \brief the QDate that is set in the widget By default, this property contains a date that refers to January 1, 2000. @@ -279,7 +279,7 @@ void QDateTimeEdit::setDate(const QDate &date) /*! \property QDateTimeEdit::time - \brief the QTime that is set in the QDateTimeEdit + \brief the QTime that is set in the widget By default, this property contains a time of 00:00:00 and 0 milliseconds. @@ -1555,13 +1555,6 @@ QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent) { } -/*! - \property QTimeEdit::time - \brief the QTime that is shown in the widget - - By default, this property contains a time of 00:00:00 and 0 milliseconds. -*/ - /*! \class QDateEdit @@ -1616,13 +1609,6 @@ QDateEdit::QDateEdit(const QDate &date, QWidget *parent) { } -/*! - \property QDateEdit::date - \brief the QDate that is shown in the widget - - By default, this property contains a date referring to January 1, 2000. -*/ - // --- QDateTimeEditPrivate --- |