AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WinCE/MSVC2008 build.

Browse Source 
See QTBUG-33473 for a similar problem.

Change-Id: Ib446618945dc1e7e1e7d43819cfae5f3c411f1bb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sérgio Martins 2013-09-23 17:34:25 +01:00 committed by The Qt Project
parent 1ac094321c
commit 62a85ae39e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qchar.cpp
View File

@ -1680,6 +1680,8 @@ struct UCS2Pair {
ushort u2;
};
inline bool operator<(const UCS2Pair &ligature1, const UCS2Pair &ligature2)
{ return ligature1.u1 < ligature2.u1; }
inline bool operator<(ushort u1, const UCS2Pair &ligature)
{ return u1 < ligature.u1; }
inline bool operator<(const UCS2Pair &ligature, ushort u1)
@ -1690,6 +1692,8 @@ struct UCS2SurrogatePair {
UCS2Pair p2;
};
inline bool operator<(const UCS2SurrogatePair &ligature1, const UCS2SurrogatePair &ligature2)
{ return QChar::surrogateToUcs4(ligature1.p1.u1, ligature1.p1.u2) < QChar::surrogateToUcs4(ligature2.p1.u1, ligature2.p1.u2); }
inline bool operator<(uint u1, const UCS2SurrogatePair &ligature)
{ return u1 < QChar::surrogateToUcs4(ligature.p1.u1, ligature.p1.u2); }
inline bool operator<(const UCS2SurrogatePair &ligature, uint u1)

2
src/corelib/tools/qregexp.cpp
View File

@ -2883,6 +2883,8 @@ static const struct CategoriesRangeMapEntry {
{ "YijingHexagramSymbols", 0x4DC0, 0x4DFF }
};
inline bool operator<(const CategoriesRangeMapEntry &entry1, const CategoriesRangeMapEntry &entry2)
{ return qstrcmp(entry1.name, entry2.name) < 0; }
inline bool operator<(const char *name, const CategoriesRangeMapEntry &entry)
{ return qstrcmp(name, entry.name) < 0; }
inline bool operator<(const CategoriesRangeMapEntry &entry, const char *name)