summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorShenghua Su <shenghua.su@tieto.com>2010-02-17 11:03:02 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-02-17 11:46:54 (GMT)
commit38a38b0c971ee910cbe1d6359eba57dd2a1a279f (patch)
tree32b5460569cb125a1d19dec1651b926c1a5de5c9 /src/corelib
parente0a674a5f5735e964d28af3d704757862f74e0b3 (diff)
downloadQt-38a38b0c971ee910cbe1d6359eba57dd2a1a279f.zip
Qt-38a38b0c971ee910cbe1d6359eba57dd2a1a279f.tar.gz
Qt-38a38b0c971ee910cbe1d6359eba57dd2a1a279f.tar.bz2
fix QTBUG-7898
Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qlocale.cpp2
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