diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-18 12:49:13 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-18 12:49:13 (GMT) |
| commit | 5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39 (patch) | |
| tree | 1845c5fd4bc6b9bc0b18b1f793a13d11870cd12d /src/corelib/tools/qlocale.cpp | |
| parent | 85628b1798ec4c98333c8f4529f5d5628f3f1bbb (diff) | |
| parent | eeb121d54e345e92ab74d8c43e07d803a0e144ea (diff) | |
| download | Qt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.zip Qt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.tar.gz Qt-5c247a8afb51ff58c4f0ef7f26c2e22d4700cd39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index ff10fa1..b4bfcaf 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2917,7 +2917,7 @@ QDate QLocale::toDate(const QString &string, FormatType format) const #ifndef QT_NO_DATESTRING QDateTime QLocale::toDateTime(const QString &string, FormatType format) const { - return toDateTime(string, dateFormat(format)); + return toDateTime(string, dateTimeFormat(format)); } #endif |