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 | |
| 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>
| -rw-r--r-- | src/corelib/text/qanystringview.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringfwd.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringliteral.h | 1 | ||||
| -rw-r--r-- | src/corelib/text/qstringmatcher.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringtokenizer.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstringview.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qtextboundaryfinder.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qutf8stringview.qdoc | 2 |
9 files changed, 9 insertions, 8 deletions
diff --git a/src/corelib/text/qanystringview.cpp b/src/corelib/text/qanystringview.cpp index 0a348080539..3a04412cfd3 100644 --- a/src/corelib/text/qanystringview.cpp +++ b/src/corelib/text/qanystringview.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:trivial-impl-only +// Qt-Security score:significant reason:trivial-impl-only #include "qanystringview.h" #include "qdebug.h" diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 5447a626a8a..5e38de9b2cc 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1,6 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // 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:trivial-impl-only +// Qt-Security score:significant reason:trivial-impl-only #ifndef QLOCALE_H #define QLOCALE_H diff --git a/src/corelib/text/qstringfwd.h b/src/corelib/text/qstringfwd.h index 83d18a8c701..163813d7285 100644 --- a/src/corelib/text/qstringfwd.h +++ b/src/corelib/text/qstringfwd.h @@ -1,6 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // 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:header-decls-only +// Qt-Security score:significant reason:header-decls-only #include <QtCore/qtconfigmacros.h> #include <QtCore/qtversionchecks.h> diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h index 11fa0794deb..432b5067da0 100644 --- a/src/corelib/text/qstringliteral.h +++ b/src/corelib/text/qstringliteral.h @@ -1,6 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2020 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:compile-time-only #ifndef QSTRINGLITERAL_H #define QSTRINGLITERAL_H diff --git a/src/corelib/text/qstringmatcher.h b/src/corelib/text/qstringmatcher.h index f04a6b15614..b9becd34c37 100644 --- a/src/corelib/text/qstringmatcher.h +++ b/src/corelib/text/qstringmatcher.h @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // Copyright (C) 2019 Mail.ru Group. // 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:trivial-impl-only +// Qt-Security score:significant reason:trivial-impl-only #ifndef QSTRINGMATCHER_H #define QSTRINGMATCHER_H 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" diff --git a/src/corelib/text/qstringview.cpp b/src/corelib/text/qstringview.cpp index ea0ec3e968a..d61fb669e8d 100644 --- a/src/corelib/text/qstringview.cpp +++ b/src/corelib/text/qstringview.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2017 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 "qstringview.h" diff --git a/src/corelib/text/qtextboundaryfinder.h b/src/corelib/text/qtextboundaryfinder.h index b68071bc843..f340982f365 100644 --- a/src/corelib/text/qtextboundaryfinder.h +++ b/src/corelib/text/qtextboundaryfinder.h @@ -1,6 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // 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:trivial-impl-only +// Qt-Security score:significant reason:trivial-impl-only #ifndef QTEXTBOUNDARYFINDER_H #define QTEXTBOUNDARYFINDER_H diff --git a/src/corelib/text/qutf8stringview.qdoc b/src/corelib/text/qutf8stringview.qdoc index 0799e6681a0..dfee8bd37c8 100644 --- a/src/corelib/text/qutf8stringview.qdoc +++ b/src/corelib/text/qutf8stringview.qdoc @@ -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 GFDL-1.3-no-invariants-only -// Qt-Security score:sensitive reason:docs +// Qt-Security score:significant reason:docs /*! \class QUtf8StringView |