diff options
author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-11 16:14:38 (GMT) |
---|---|---|
committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-11 16:14:38 (GMT) |
commit | ebb0b4046cab4ea94795e8fb2ceb3242393e1040 (patch) | |
tree | b85574a72d95e6dd9c9258faecb87700bc2bbe9b /tests/auto/qlocale/tst_qlocale.cpp | |
parent | 262d0348f7a38a22809662e296545d07d686afde (diff) | |
parent | 5c5310803f34c8fcf3aee6b7bb5c2bc6caf3107c (diff) | |
download | Qt-ebb0b4046cab4ea94795e8fb2ceb3242393e1040.zip Qt-ebb0b4046cab4ea94795e8fb2ceb3242393e1040.tar.gz Qt-ebb0b4046cab4ea94795e8fb2ceb3242393e1040.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qlocale/tst_qlocale.cpp')
-rw-r--r-- | tests/auto/qlocale/tst_qlocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 6301d40..1d7e67d 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -2042,7 +2042,7 @@ void tst_QLocale::symbianSystemLocale() TBuf<50> s60FormattedDate; TRAPD(err, s60Date.FormatL(s60FormattedDate, s60DateFormat)); QVERIFY(err == KErrNone); - QString s60FinalResult = qt_TDes2QStringL(s60FormattedDate); + QString s60FinalResult = qt_TDesC2QString(s60FormattedDate); QString finalResult = date.toString(dateFormat); QCOMPARE(finalResult, s60FinalResult); |