diff options
| author | axis <qt-info@nokia.com> | 2009-11-03 10:16:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-03 10:16:33 (GMT) |
| commit | 51f258fb39e5bac9d3a2757afd8661e63c3d2680 (patch) | |
| tree | d5788c8e530476443b5218d6ae5f94e1e064d40e /src/gui/kernel/qclipboard.cpp | |
| parent | 1ef5dddf91c666664911686ca77cb6c1b2cde828 (diff) | |
| parent | 9fab0ede200960f0dbec1457757a6ba3214c3ce6 (diff) | |
| download | Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.zip Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.tar.gz Qt-51f258fb39e5bac9d3a2757afd8661e63c3d2680.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/gui/kernel/qclipboard.cpp')
| -rw-r--r-- | src/gui/kernel/qclipboard.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 5ed4dc9..e43f8b5 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -296,12 +296,16 @@ QString QClipboard::text(QString &subtype, Mode mode) const const QByteArray rawData = data->data(QLatin1String("text/") + subtype); +#ifndef QT_NO_TEXTCODEC QTextCodec* codec = QTextCodec::codecForMib(106); // utf-8 is default if (subtype == QLatin1String("html")) codec = QTextCodec::codecForHtml(rawData, codec); else codec = QTextCodec::codecForUtfText(rawData, codec); return codec->toUnicode(rawData); +#else //QT_NO_TEXTCODEC + return rawData; +#endif //QT_NO_TEXTCODEC } /*! |