diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-19 14:56:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-19 16:02:52 +0100 |
| commit | 48577b2e7f17a26c1d903cb8ecbd30e41c231137 (patch) | |
| tree | e7498f68a15e2e18b8412eefe7f248d379d94d99 /src/corelib | |
| parent | fa0906bc5664913f232721d611e6e7906892d766 (diff) | |
| parent | 6c6ace9d23f90845fd424e474d38fe30f070775e (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/plugins/sqldrivers/psql/qsql_psql.cpp
Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 08fe9b899d..b56ad34546 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -568,10 +568,6 @@ static int ucstricmp(const QChar *a, const QChar *ae, const QChar *b, const QCha { if (a == b) return (ae - be); - if (a == 0) - return be - b; - if (b == 0) - return a - ae; const QChar *e = ae; if (be - b < ae - a) @@ -600,11 +596,6 @@ static int ucstricmp(const QChar *a, const QChar *ae, const QChar *b, const QCha // Case-insensitive comparison between a Unicode string and a QLatin1String static int ucstricmp(const QChar *a, const QChar *ae, const char *b, const char *be) { - if (!a) - return be - b; - if (!b) - return a - ae; - auto e = ae; if (be - b < ae - a) e = a + (be - b); |