diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 00:14:57 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 00:14:57 (GMT) |
commit | d67a5534cb50f66807b87526d42603c7d4df3595 (patch) | |
tree | f8ac995ec6dd183649a3614412f8ecfc043cd1b1 /src/gui/widgets/qdatetimeedit.cpp | |
parent | 01550804c1fdb042b8b58528f716888e729be868 (diff) | |
parent | a2cede57d2ff5358148a25d6a41de777144a5fe7 (diff) | |
download | Qt-d67a5534cb50f66807b87526d42603c7d4df3595.zip Qt-d67a5534cb50f66807b87526d42603c7d4df3595.tar.gz Qt-d67a5534cb50f66807b87526d42603c7d4df3595.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
add autotest for QString::setRawData()
Fixed case of a library file name to enable MinGW builds on Fedora.
Doc: Made Qt::TextLongestVariant internal again.
Doc: Fixed minor documentation issues.
Doc: Reorganized the platform and compiler notes pages.
Doc: Removed non-ASCII characters and reformatted the text.
Doc: Fixed documentation style and qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Doc: Fixed snippet reference for the Getting Started QML guide.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Fixed warnings caused by an earlier change. Made docs consistent.
Doc: Renamed an external reference to work around an auto-linking issue.
Doc: Fixed qdoc warnings.
Doc: Fixed links to the online BSD license information.
Doc: Fixed qdoc warnings.
Doc: Re-added a link to the Qt site related to testing tools.
Doc: Marked some new properties as internal for now.
Doc: Renamed a project file.
Doc: Added missing examples and snippets.
Diffstat (limited to 'src/gui/widgets/qdatetimeedit.cpp')
-rw-r--r-- | src/gui/widgets/qdatetimeedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 36a3147..f2e8fd2 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -832,11 +832,11 @@ QString QDateTimeEdit::sectionText(Section section) const This format is the same as the one used described in QDateTime::toString() and QDateTime::fromString() - Example format strings(assuming that the date is 2nd of July 1969): + Example format strings (assuming that the date is 2nd of July 1969): \table \header \i Format \i Result - \row \i dd.MM.yyyy \i 02.07.1969 + \row \i dd.MM.yyyy \i 02.07.1969 \row \i MMM d yy \i Jul 2 69 \row \i MMMM d yy \i July 2 69 \endtable |