diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2025-09-19 23:05:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-09-24 04:46:50 +0000 |
| commit | c02047e39f1da44620ed4c47a54dbf393bbff48c (patch) | |
| tree | f39b4ed57421feea3d2bbf3eeb0a4703b176c98d /src/corelib/text/qstringtokenizer.cpp | |
| parent | 28ef1f4c2f7b5c2e0d915eb138a3fc6f1fa0e352 (diff) | |
Fix Qt-Security score:(sensitive => significant)
We merged several markings with the wrong tag. Fix them.
Amends 677f97ecad30577a7e4cc7423554e66a4f19abba,
17e58599bed71be3b119874aa4ea296f44081977,
993f327901cc93e5617fa0b2172aab4793d5be34,
9e479614d95a0859491ef8cbcc79a3a92f18a649,
5f6bfa3692a91c9f162606c25ec496656c253dfe,
9efcf1457229ef33a4c336b6a8ffd31333f5c105, and
8a5b5584006b21cdefd931c7f173ac546a89a100.
Manual conflict resolution for 6.10:
- dropped changes to qstringconverter_base_deprecated.h,
which is new in dev.
Task-number: QTBUG-135195
Change-Id: Ica405acf0915fd584c98a504f0d4bfa57dc33482
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 35accdaa5ca142e9c34342cc579c1f1be114eb72)
(cherry picked from commit 6d02ebdc4e72bbff272c2ff3a14017ab33f3f5fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/text/qstringtokenizer.cpp')
| -rw-r--r-- | src/corelib/text/qstringtokenizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstringtokenizer.cpp b/src/corelib/text/qstringtokenizer.cpp index ff9f69a7ea7..68c976aa9e8 100644 --- a/src/corelib/text/qstringtokenizer.cpp +++ b/src/corelib/text/qstringtokenizer.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -// Qt-Security score:sensitive reason:docs-only +// Qt-Security score:significant reason:docs-only #include "qstringtokenizer.h" #include "qstringalgorithms.h" |