diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-02-20 04:18:00 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-20 04:18:00 +0000 |
| commit | 3190edb07735bb47b7cf85c582d415ab6487a446 (patch) | |
| tree | 3e3dd3d0c3902ef82d93b99e235a8bc5d1b66309 /src/corelib/tools/qstring.cpp | |
| parent | 13e51ea48758337397164a548d4c82d079067ae3 (diff) | |
| parent | 48577b2e7f17a26c1d903cb8ecbd30e41c231137 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -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); |