summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-11-23 12:48:45 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-11-23 12:59:16 (GMT)
commit167a100f8fab7644d78ef219dbdd1a28f0e51cee (patch)
treecf375dbb62ea6b1e374226d906fac9c24c0f7191
parent9746f31088961645e59c0d4a8d995601153a9ee7 (diff)
downloadQt-167a100f8fab7644d78ef219dbdd1a28f0e51cee.zip
Qt-167a100f8fab7644d78ef219dbdd1a28f0e51cee.tar.gz
Qt-167a100f8fab7644d78ef219dbdd1a28f0e51cee.tar.bz2
Fix compilation on symbian
Introduced with 360f596183969a4c69 armcc cannot find the static operator in qBinaryFind Reviewed-by: axis
-rw-r--r--src/corelib/tools/qchar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 43b1552..fba0bd2 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -1494,9 +1494,9 @@ struct UCS2Pair {
ushort u2;
};
-static inline bool operator<(ushort u1, const UCS2Pair &ligature)
+inline bool operator<(ushort u1, const UCS2Pair &ligature)
{ return u1 < ligature.u1; }
-static inline bool operator<(const UCS2Pair &ligature, ushort u1)
+inline bool operator<(const UCS2Pair &ligature, ushort u1)
{ return ligature.u1 < u1; }
static ushort ligatureHelper(ushort u1, ushort u2)