diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 09:02:31 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 09:02:31 (GMT) |
| commit | e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512 (patch) | |
| tree | efc5ef88c45c28c61aadf632e830e3b06ef80ddc /src/gui/itemviews/qitemdelegate.cpp | |
| parent | 7b9fd32139d1e381f45a0655dafbfc98dc9aca39 (diff) | |
| parent | 3e5794f6a622414b0e7c01ffe00d664fead37c40 (diff) | |
| download | Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.zip Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.tar.gz Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
| -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 25ea4c9..d5f6fd2 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -1024,7 +1024,7 @@ QPixmap QItemDelegate::decoration(const QStyleOptionViewItem &option, const QVar // hacky but faster version of "QString::sprintf("%d-%d", i, enabled)" static QString qPixmapSerial(quint64 i, bool enabled) { - ushort arr[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', '0' + enabled }; + ushort arr[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', ushort('0' + enabled) }; ushort *ptr = &arr[16]; while (i > 0) { |