projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
68c90dd
)
Windows/ICU: Compile fix.
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Mon, 11 Jun 2012 08:16:29 +0000
(10:16 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 12 Jun 2012 05:11:39 +0000
(07:11 +0200)
Change-Id: I95c281b0e577a89e4d92dd16fd039ab9e53036f5
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/corelib/tools/qcollator.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/tools/qcollator.cpp
b/src/corelib/tools/qcollator.cpp
index
58d9a0b
..
72485eb
100644
(file)
--- a/
src/corelib/tools/qcollator.cpp
+++ b/
src/corelib/tools/qcollator.cpp
@@
-565,7
+565,7
@@
QStringList QCollator::indexCharacters() const
if (U_FAILURE(status)) {
d->indexCharacters = englishIndexCharacters();
} else {
- QString chars
= QString::fromUtf16(val
, len);
+ QString chars
(reinterpret_cast<const QChar *>(val)
, len);
chars.remove('[');
chars.remove(']');
chars.remove('{');