1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix real dot in location keys regular expression

Browse Source 
Location keys are meant to be used as regular expression.
The . need to be appear as `\.` in the regular expression.
The JSON parser interprets the `\`, hence the `\\.`.

Task-number: QTBUG-121039
Change-Id: Ie3b8fb9686d59db13e5522309adbf3877bd2a3f7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit eb87f7bcb98afccde315a10c5e26dc3485f5d92f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lucie Gérard 2024-04-19 12:11:49 +02:00 committed by Qt Cherry-pick Bot
parent 8c2518bee8
commit 1c8bf0dcbf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
licenseRule.json
View File

@ -22,7 +22,7 @@
"file type" : "examples and snippets", "file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}, },
"tests/auto/cmake/test_plugin_shared_static_flavor.cmake" : { "tests/auto/cmake/test_plugin_shared_static_flavor\\.cmake" : {
"comment" : "Exception. This is a test file.", "comment" : "Exception. This is a test file.",
"file type" : "test", "file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
@ -45,7 +45,7 @@
"file type" : "examples and snippets", "file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}, },
"tests/auto/tools/uic/baseline/config.ui.py" : { "tests/auto/tools/uic/baseline/config\\.ui\\.py" : {
"comment" : "This is a test file", "comment" : "This is a test file",
"file type" : "test", "file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
@ -61,7 +61,7 @@
"file type" : "documentation", "file type" : "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}, },
"tests/auto/corelib/mimetypes/qmimedatabase/test.txt" : { "tests/auto/corelib/mimetypes/qmimedatabase/test\\.txt" : {
"comment" : "Exception. This is a test file", "comment" : "Exception. This is a test file",
"file type" : "test", "file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
@ -94,12 +94,12 @@
"file type" : "module and plugin", "file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"src/dbus/dbus_minimal_p.h" : { "src/dbus/dbus_minimal_p\\.h" : {
"comment" : "Exception", "comment" : "Exception",
"file type" : "module and plugin", "file type" : "module and plugin",
"spdx" : ["AFL-2.1 OR GPL-2.0-or-later"] "spdx" : ["AFL-2.1 OR GPL-2.0-or-later"]
}, },
"src/entrypoint/qtentrypoint_win.cpp" : { "src/entrypoint/qtentrypoint_win\\.cpp" : {
"comment" : "Exception: https://doc.qt.io/qt-6/qtentrypoint.html", "comment" : "Exception: https://doc.qt.io/qt-6/qtentrypoint.html",
"file type" : "module and plugin", "file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
@ -119,12 +119,12 @@
"file type" : "test", "file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"cmake/qbatchedtestrunner.in.cpp" : { "cmake/qbatchedtestrunner\\.in\\.cpp" : {
"comment" : "Compiled into internal tests if QT_BUILD_TESTS_BATCHED is enabled.", "comment" : "Compiled into internal tests if QT_BUILD_TESTS_BATCHED is enabled.",
"file type" : "test", "file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"tests/auto/testlib/selftests/catch_p_p.h" : { "tests/auto/testlib/selftests/catch_p_p\\.h" : {
"comment" : "Exception", "comment" : "Exception",
"file type" : "test", "file type" : "test",
"spdx" : ["BSL-1.0"] "spdx" : ["BSL-1.0"]
@ -134,17 +134,17 @@
"file type" : "examples and snippets", "file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}, },
"config.tests/" : { "config\\.tests/" : {
"comment" : "Default", "comment" : "Default",
"file type" : "build system", "file type" : "build system",
"spdx" : ["BSD-3-Clause"] "spdx" : ["BSD-3-Clause"]
}, },
"config.tests/no_direct_extern_access/" : { "config\\.tests/no_direct_extern_access/" : {
"comment" : "Exception", "comment" : "Exception",
"file type" : "build system", "file type" : "build system",
"spdx" : ["MIT"] "spdx" : ["MIT"]
}, },
"src/corelib/Qt6CoreResourceInit.in.cpp" : { "src/corelib/Qt6CoreResourceInit\\.in\\.cpp" : {
"comment" : "Helper file statically compiled into user executables", "comment" : "Helper file statically compiled into user executables",
"file type" : "module and plugin", "file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
@ -169,7 +169,7 @@
"file type" : "util", "file type" : "util",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
}, },
"util/glgen/qopenglextensions.(h|cpp).header" : { "util/glgen/qopenglextensions\\.(h|cpp)\\.header" : {
"comment" : "Exception, for file generation", "comment" : "Exception, for file generation",
"file type" : "util", "file type" : "util",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]