diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:56:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:56:17 +0100 |
| commit | 812bb236dd1622896b6a0ca9bbe1334a69855aa2 (patch) | |
| tree | 94031beabaf904e2380740cec8951b3c1152203c /src/corelib/tools/qstringalgorithms.h | |
| parent | 79d78d814acad4e183e281aea9b131f396abe3fb (diff) | |
| parent | 50117d738af526cbfbd5afa50b9a501acb0fb9ce (diff) | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5
Diffstat (limited to 'src/corelib/tools/qstringalgorithms.h')
| -rw-r--r-- | src/corelib/tools/qstringalgorithms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstringalgorithms.h b/src/corelib/tools/qstringalgorithms.h index 336da87468..aaa702301e 100644 --- a/src/corelib/tools/qstringalgorithms.h +++ b/src/corelib/tools/qstringalgorithms.h @@ -55,7 +55,7 @@ template <typename T> class QVector; namespace QtPrivate { -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qssize_t qustrlen(const ushort *str) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype qustrlen(const ushort *str) Q_DECL_NOTHROW; Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; |