diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 10:16:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 10:16:50 (GMT) |
| commit | 037a3d01cbb0655a9d822a48f579bb346a0ef2c9 (patch) | |
| tree | 8afd046bcf8d2e8281f3a0202cd0e366c273aa29 /src/gui/itemviews | |
| parent | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff) | |
| parent | 470b2de3e24b8eca056a31728a5e1039a9a25d79 (diff) | |
| download | Qt-037a3d01cbb0655a9d822a48f579bb346a0ef2c9.zip Qt-037a3d01cbb0655a9d822a48f579bb346a0ef2c9.tar.gz Qt-037a3d01cbb0655a9d822a48f579bb346a0ef2c9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 6fd26a7..9069ce4 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -1033,7 +1033,7 @@ static QString qPixmapSerial(quint64 i, bool enabled) i >>= 4; } - return QString::fromUtf16(ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr)); + return QString((const QChar *)ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr)); } /*! |