Commit Graph

953 Commits

Author SHA1 Message Date
Juha Vuolle 9be52337fd Skip sax autotests if XML is disabled
Qt lite configurations may disable XML altogether (-no-feature-xml).
Sax autotests link and rely on XML => disable tests when XML is
disabled.

Fixes: QTBUG-136673
Change-Id: Idd837781651d2b834a28ee8cd52516886a95b744
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
2025-05-13 11:48:42 +03:00
Qt Submodule Update Bot 6d6637757f Update dependencies on 'dev' in qt/qt5compat
Change-Id: I97c881cbf51a4438de429dfaea013015eb7a36aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-05-08 15:24:45 +00:00
Qt Submodule Update Bot bd407c33e7 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I7684483efb3a26e5834004575e8e0ce33886e435
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-05-03 02:19:20 +00:00
Qt Submodule Update Bot 444c148716 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I7ca3464c3cef972f1adbd2d1f9fe37ec2f0a56ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-05-01 08:58:23 +00:00
Qt Submodule Update Bot f5962d6989 Update dependencies on 'dev' in qt/qt5compat
Change-Id: Id88c6d5f2e448add1128d8139750e372752afab0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-29 11:44:17 +00:00
Qt Submodule Update Bot f21a6a33d8 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I92de71d4c124b2a2c6e0fde46196defdeaeb5e3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-24 09:35:09 +00:00
Qt Submodule Update Bot aaec5f909b Update dependencies on 'dev' in qt/qt5compat
Change-Id: Iee92ad8993669903b98b65cf56d093f314d74e3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-22 14:05:23 +00:00
Qt Submodule Update Bot 3c1956a150 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I88d809afa3a7a9b63eaf29da6ef9af22d9095b68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-15 11:31:05 +00:00
Qt Submodule Update Bot 3a73433230 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I3a47a726622fcfa885bd29638810b8227e1ea353
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-09 23:56:26 +00:00
Qt Submodule Update Bot e287a65eb7 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I586991be84d1b6daabedb4778c06a9af75b484fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-03 15:51:11 +00:00
Qt Submodule Update Bot 935a28b23b Update dependencies on 'dev' in qt/qt5compat
Change-Id: I5c56cc230d441ff2d464c6ce544fe83fd459457c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-04-01 12:48:37 +00:00
Qt Submodule Update Bot b27a08dc70 Update dependencies on 'dev' in qt/qt5compat
Change-Id: Ia90a21ab04033a926fe8149b6288d6d81119f25a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-29 16:10:17 +00:00
Matthias Rauter 1f135d43e4 Remove debug flag from benchmark
If debug symbols are needed, then pass the respective flag to the
configure script.

Pick-to: 6.9 6.8
Change-Id: I70f8cad624d2e5cfae255a24c9f82010c0c868d9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2025-03-28 11:09:23 +00:00
Qt Submodule Update Bot f7b92a255c Update dependencies on 'dev' in qt/qt5compat
Change-Id: Iefb07b97dfcd9febce4a001f3e65ae27a71f229b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-03-19 17:56:25 +00:00
Thiago Macieira d3b3c605a0 qt5compat: use qHashMulti & qHashRange instead of QHashCombine
If we have a front-end function and no specific need for the private
class, use it.

Change-Id: I73578ea802d3b905a53bfffd504c20af0ca96cf8
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
2025-03-19 10:21:04 -07:00
Lucie Gérard 9c9903baef Update licensing of files with infrastructure type
A QUIP 18[1] update sets git files, REUSE.toml and licenseRule.json
as infrastructure type files. They are licensed with:
LicenseRef-Qt-Commercial OR BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.9 6.8
Change-Id: Ic8bbbe487a6ea91fef83370419280f15cb24551b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2025-03-12 16:05:07 +01:00
Lucie Gérard f9576fac2a Make module ready for source SBOM checking
This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding rules to the licenseRule.json files
- correcting the licensing given via REUSE.toml files
- renaming license files not located in LICENSES folder.
Their name needs to be prefixed with `LICENSE.` to be ignored
by reuse and excluded from the source SBOM. The names are
updated in the corresponding qt_attribution.json

A lot of files are skipped during the license test,
but all are present in the source SBOM.
This is why corrections are needed before turning the
source SBOM check on.

[ChangeLog][Third-Party Code] Renaming the license files with prefix
LICENSE. to have them ignored by reuse tool.

Task-number: QTBUG-131434
Pick-to: 6.9 6.8
Change-Id: Ib6639c161f62ccd2dbfefdf6cf9f9dcc8d060adf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2025-02-28 10:47:45 +01:00
Qt Submodule Update Bot e08fe70f7e Update dependencies on 'dev' in qt/qt5compat
Change-Id: I94d877f779271e5a3e0c2dbe22e817f810df490c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-02-28 08:32:09 +00:00
Paul Wicking 2164c014aa Add .gitreview file
`git-review` is a command line tool for interacting with Gerrit.
Some IDEs offer support for this tool, either natively or through
plugins. The tool relies on a configuration file, .gitreview. Adding
this configuration file to our repositories simplifies initial setup
for contributors that use the tool directly or through their IDE of
choice.

The configuration file adds a remote called 'gerrit'. This is the
default for the tool, and also the name set for
codereview.qt-project.org by Qt's `init-repository` script. Thus,
the configuration should work seamlessly alongside other repository
helpers.

As the file format doesn't seem to be designed with comments in mind,
add it to the other version control system exemptions in REUSE.toml.

Task-number: QTBUG-132604
Pick-to: 6.9 6.8
Change-Id: I4296d81b07bf3b0300693d4914b7eb64eeb25474
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
2025-02-25 15:39:40 +01:00
Axel Spoerl 97ae4c79bf doc: Remove ConversionFlags and ConverterState documentation
ConversionFlag enum values are documented as a type alias under its
corresponding QFlags class.
ConverterState has an empty typealias documentation.

Both are only built, if Qt is configured without QT_CONFIG(textcodec).
The documentation, however, is built unconditionally.

Wrapping documentation in an ifdef still results in warnings.
Remove documentation altogether, because enum values are
self-explanatory.

Task-number: QTBUG-133892
Pick-to: 6.8
Change-Id: I870effd6654f0cda161e2128ccb9e51ac491a34b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit db733a992e)
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2025-02-24 08:01:36 +00:00
David Boddie e210f2ff94 doc: Add qtquick as a documentation dependency
Task-number: QTBUG-133892
Pick-to: 6.8
Change-Id: I4b5458beeff4e5981c90b3332203769d08bab07d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 5a6b412bed)
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2025-02-24 08:01:33 +00:00
David Boddie bc146c999b doc: Remove invalid reimp commands
Remove invalid reimp commands.
Task-number: QTBUG-133892
Pick-to: 6.8

Change-Id: I9d4da929456d702e0c204ec4f1c0875b3f0ec168
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2025-02-24 08:01:29 +00:00
Qt Submodule Update Bot 57f5f1c3f3 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I20ae36246f8ba3a2ea4e880e8a2a6bb6530af2bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-02-24 08:01:27 +00:00
Alexei Cazacov 4aeeb4a4ef Doc: Merge Qt Graphical Effects docs. Fix the tree
This commit fixes the tree broken with 616754.

Fixes: QTBUG-132209
Pick-to: 6.9 6.8
Change-Id: I57846f54928f6ac32234748d08db244f917720ce
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2025-02-17 14:35:22 +00:00
Safiyyah Moosa 99c4232e53 Doc: Merge Qt Graphical Effects docs
Currently there are two pages that describe the Qt Graphical Effects
module, namely, qtgraphicaleffects5-index.html and
graphicaleffects5.html. These pages contain most of the same
information.

This patch merges the information from both pages into one page,
namely, qtgraphicaleffects5-index.html. It keeps the categorization of
types from graphicaleffects5.html. It deletes redundant information on the page,
graphicaleffects5.html.

Fixes: QTBUG-132209
Pick-to: 6.7 6.8 6.9
Change-Id: I05eef8a4eaf7d86fbd18d08e58eb5ff7a0a9bb09
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2025-01-24 10:20:37 +01:00
Marc Mutz 2d8df31902 Fix QFile::open() Easter Egg
Fix the delayed marking of QFile::open() as [[nodiscard]] in this
module, too.

Pick-to: 6.9 6.8 6.5
Change-Id: I7b1d76cc23c2ce1dfb8c03ca945dcecb6c54988f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2025-01-24 06:24:07 +00:00
Marc Mutz 736f207cce QtSAX: replace QScopedPointer with std::unique_ptr use
Marking the whole module as QT_NO_SCOPED_POINTER is still blocked
by QtCore headers not being QT_NO_SCOPED_POINTER-clean.

Pick-to: 6.9 6.8
Task-number: QTBUG-132215
Change-Id: I0759032f028595b6957b125245d3ff9d302274bd
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
2025-01-24 05:39:25 +00:00
Qt Submodule Update Bot dc82666459 Update dependencies on 'dev' in qt/qt5compat
Change-Id: Ie98afbfe443a6f6f251c8ee1745a82d50b4068c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-23 19:56:23 +00:00
Qt Submodule Update Bot 377353c209 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I4c95ea82e1fb8a89a2e3e69434dee391f3875eff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-20 13:32:29 +00:00
Qt Submodule Update Bot a6f09a550e Update dependencies on 'dev' in qt/qt5compat
Change-Id: I6f903b52fb7a8aded60a033314469dac553ed9b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-14 18:18:06 +00:00
Jani Heikkinen 2775aae09d Bump version to 6.10.0
Change-Id: I3b50130dcb5044c8b6752e70d515428c1188cf46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-03 14:15:19 +00:00
Qt Submodule Update Bot 97a093d893 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I1ecd771ef52c803e9218fd0b7479c9b6c4aa6940
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-01-03 14:15:18 +00:00
Marc Mutz 6b5138b2a8 tst_qutf8: port from QScopedPointer to std::unique_ptr
In preparation of introducing QT_NO_SCOPED_POINTER.

Pick-to: 6.9 6.8
Task-number: QTBUG-132215
Change-Id: I2d85fde7ee153bd165709c3e11976531d23da343
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
2024-12-18 13:30:20 +01:00
Marc Mutz 34d8bc2c92 tst_QStringRef: protect QASV{QSR} test from all except GCC
QNX, too believes that QASV{QStringRef} is still ambiguous, even after
qtbase/a0e65398483729259cf58781949133c6055fdc7c and
qt5compat/5f94627eda523112116917ca08e6d0ab281bd5ea. Comment the test
out for all compilers except non-QNX GCC for now.

Task-number: QTBUG-122797
Pick-to: 6.9 6.8 6.5
Change-Id: I8563d48015babdbb79e107e7f5bfc063cc3dbc06
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2024-12-18 10:11:33 +00:00
Marc Mutz 50b8f5b533 QRegExp: replace QScopedPointer with std::optional
QRegExpEngine's size is already prety large, and QRegExpCharClass
isn't huge (2 QLists and an int + bool (the latter could probably be
packed into the former), so the space overhead isn't much,
pecentage-wise.

This is in preparation of adding QT_NO_SCOPED_POINTER.

Pick-to: 6.9 6.8
Task-number: QTBUG-132215
Change-Id: I3e71e631231baf6451b70a08ec6a288b369c6e49
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
2024-12-18 08:24:24 +01:00
Marc Mutz 9f8bfaa8cb tst_QStringRef: protect QASV{QSR} test from MSVC
MSVC believes that QASV{QStringRef} is still ambiguous, even after
qtbase/a0e65398483729259cf58781949133c6055fdc7c and
qt5compat/5f94627eda523112116917ca08e6d0ab281bd5ea. Comment the test
out for MSVCfor now.

Reopens: QTBUG-122797
Pick-to: 6.9 6.8 6.5
Change-Id: I1be144b15bc6245fb36a3bd9abac6685844fd7d5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2024-12-17 11:46:44 +01:00
Marc Mutz 5f94627eda QStringRef: preserve null-ness when converting to QAnyStringView
Like for the conversion to QStringView, the conversion to
QAnyStringView was hitting the QASV{container} ctor, which doesn't
deal with QString(Ref)'s funny isNull()-but-data()-!=-nullptr
bug^Wpolicy, leading to null-ness being lost in the conversion.

At some point, it didn't even compile (cf. QTBUG-122797), though this
author could not reproduce the issue after fixing QTBUG-122798.

Fix by providing an implicit conversion operator to
QAnyStringView. This fixes the issue for conversion, but if a user
forces construction (e.g. using QAnyStringView{sr}), then the
QASV{container} ctor is still chosen, and still breaks
null-less. QStringView has the same problem, at the moment.

Fixing that requires changes in QtBase, so guard dependent code with
a macro that a fixed QtCore will set, incl. in QStringRef::operator
QASV() itself.

[ChangeLog][QtCore5Compat][QStringRef] Fixed missing conversion to
QAnyStringView.

Task-number: QTBUG-122797
Pick-to: 6.9 6.8 6.5
Change-Id: Ic848332e8f9e052d1359fa4532131e93e1b5c13c
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
2024-12-15 13:41:17 +00:00
Marc Mutz 63add2fdd8 QStringRef: fix lost null-ness when converting to QStringView
When QStringRef was moved out of QtCore, QStringRef (which needs the
same special isNull() handling that QString also needs, due to the
never-nullptr data() bug^Wpolicy) was dropped from QStringView's
if_qstring_like constraint, and the replacement QStringRef::operator
QStringView() didn't take the issue into account for all cases:

A QStringRef with a nullptr string() will create a null QStringView,
but a likewise isNull() QStringRef constructed over an isNull()
QString will create a non-null QStringView (over
QStringRef::data()::_empty).

Fix by checking for QStringRef::isNull() instead of just !m_string in
operator QStringView().

Amends 80ffb97660.

[ChangeLog][QtCore5Compat][QStringRef] Fixed a Qt 6 regression where
conversion to QStringView would no longer preserve nullness.

Task-number: QTBUG-122798
Pick-to: 6.9 6.8 6.5
Change-Id: Ie28e02c6553271a2cb6e8e6816de8c79b8c84b31
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
2024-12-12 15:43:17 +01:00
Marc Mutz 6d80b76e9e tst_QStringRef: check that QStringRef->QStringView preserves nullness
It did, in Qt 5, but the test, if ever there was one, got lost when
QStringRef moved out of QtCore. Subsequently, the property was
broken.

Task-number: QTBUG-122798
Pick-to: 6.9 6.8 6.5
Change-Id: I517307c5f999457e353b9cf7200158d99fecd3ac
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
2024-12-12 14:45:22 +01:00
Qt Submodule Update Bot 9b7642a357 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I482ceaf3d3c5cd793d100fb6b4ea67bd06dfb5d6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-08 17:02:19 +00:00
Qt Submodule Update Bot d3bb61302c Update dependencies on 'dev' in qt/qt5compat
Change-Id: I7921c73f88c95e5f56e4821371ea3289ecbae062
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-08 03:30:15 +00:00
Qt Submodule Update Bot 9e0fc26d8e Update dependencies on 'dev' in qt/qt5compat
Change-Id: I9c42c4f9b7799d9fa7da8d9194f389dff60b77c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-03 13:49:59 +00:00
Qt Submodule Update Bot 9acf03dc8a Update dependencies on 'dev' in qt/qt5compat
Change-Id: I4b87cc251bbb1ff0e4396dcfa3f1e233dfedd7bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-12-02 13:50:35 +00:00
Qt Submodule Update Bot 3d3a0d0698 Update dependencies on 'dev' in qt/qt5compat
Change-Id: Ib7429a23bff3ff8857c0ccb3f90a4f09968ff8e7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-28 12:18:12 +00:00
Qt Submodule Update Bot 8af9ee1473 Update dependencies on 'dev' in qt/qt5compat
Change-Id: Ia71df31d22759ced646504c4eb36039443f78b22
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-26 15:29:13 +00:00
Qt Submodule Update Bot ced84ae96e Update dependencies on 'dev' in qt/qt5compat
Change-Id: I150712989204d862718449306a690a86d02ca053
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-25 22:12:36 +00:00
Qt Submodule Update Bot ea8f107612 Update dependencies on 'dev' in qt/qt5compat
Change-Id: I3bd7b786809e9dd5d39b0b3d7493ba1d6830856f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-19 16:49:01 +00:00
Thiago Macieira 464c9761e2 tst_QTextCodec::utf32Codec: Split the Chakma digits into multiple rows
So it's easier to see what the error is.

Drive-by make it compile with Qt 5.

Pick-to: 6.8
Change-Id: I2fe31a7ad762bdd38ca3fffd9f903b5e64da4691
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2024-11-11 19:49:51 -07:00
Qt Submodule Update Bot 0b848169ac Update dependencies on 'dev' in qt/qt5compat
Change-Id: Iad0c2dc6a3a32dd400f49e41db259255c04b77f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-11-07 05:23:08 +00:00
Lucie Gérard c6c60f07c5 Add REUSE.toml files and missing licenses
REUSE.toml files are read by reuse to complement or override the
copyright and licensing information found in file.

The use of REUSE.toml files was introduced in REUSE version 3.1.0a1.
This reuse version is compatible with reuse specification
version 3.2 [1].
With this commit's files,
* The SPDX document generated by reuse spdx conforms to SPDX 2.3,
* The reuse lint command reports that the Qt project is reuse compliant.

In order to be reuse compliant all the licenses referenced in file
or within a REUSE.toml file must be present in the LICENSES
directory at the base of the module.
The missing licenses are added.

[1]: https://reuse.software/spec-3.2/

Task-number: QTBUG-124453
Task-number: QTBUG-125211
Pick-to: 6.8
Change-Id: I330938ead940b59054750a0e2bdb5c1936e146a5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2024-11-06 12:49:07 +00:00