diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-04 11:40:27 (GMT) |
| commit | 7b46aa91709fd7df0ca791d63f68ee5a9436d50a (patch) | |
| tree | fd10fd74d729124d6ef4099f6fe933e3ad9fa9ab /examples/network/qftp/sym_iap_util.h | |
| parent | 4cd8dd562ea149d5a6cdcc15533e4975682106f6 (diff) | |
| parent | 3569038ffec0c133ff29f80d506f334cc0f2ddb3 (diff) | |
| download | Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.zip Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.gz Qt-7b46aa91709fd7df0ca791d63f68ee5a9436d50a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'examples/network/qftp/sym_iap_util.h')
| -rw-r--r-- | examples/network/qftp/sym_iap_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h index 8079d2c..41e43a9 100644 --- a/examples/network/qftp/sym_iap_util.h +++ b/examples/network/qftp/sym_iap_util.h @@ -298,7 +298,7 @@ QString qt_TDesC2QStringL(const TDesC& aDescriptor) #ifdef QT_NO_UNICODE return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length()); #else - return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length()); + return QString((const QChar *)aDescriptor.Ptr(), aDescriptor.Length()); #endif } |