diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-07 12:24:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-09 20:59:58 +0200 |
| commit | aef0aac581fbbead07be939873e34045137b94ff (patch) | |
| tree | 8c3ba5f67027a1c7fef1ce3e6bbfbc3379558af3 /tools | |
| parent | 03d039fcf255392d52b0fd4b6c47cedf546aa82f (diff) | |
Compile against latest qtbase
Adjust to the lastest changes in QList and QString.
Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmllint/checkidentifiers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmllint/checkidentifiers.cpp b/tools/qmllint/checkidentifiers.cpp index 09678c2e6a..6f28709a87 100644 --- a/tools/qmllint/checkidentifiers.cpp +++ b/tools/qmllint/checkidentifiers.cpp @@ -37,7 +37,7 @@ class IssueLocationWithContext { public: IssueLocationWithContext(const QString &code, const QQmlJS::SourceLocation &location) { - int before = std::max(0,code.lastIndexOf(QLatin1Char('\n'), location.offset)); + int before = qMax(0,code.lastIndexOf(QLatin1Char('\n'), location.offset)); m_beforeText = QStringView{code}.mid(before + 1, int(location.offset - (before + 1))); m_issueText = QStringView{code}.mid(location.offset, location.length); int after = code.indexOf(QLatin1Char('\n'), int(location.offset + location.length)); |