summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Generate vcpkg manifestJoerg Bornemann7 days1-1/+5
| | | | | | | | | Annotate qt_find_package calls for vcpkg.json generation. Pick-to: 6.11 Task-number: QTBUG-73760 Change-Id: I42112acdda8ca4a1ec48a82a4abcdb66b6598520 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Port Q_ENUMS to Q_ENUMAhmad Samir2025-11-251-1/+1
| | | | | | | | | | | Q_ENUM does what Q_ENUMS did plus declaring two friend functions, so the behavior should be the same. Q_ENUMS has been deprecated since at least Qt 6. Pick-to: 6.10 6.8 6.5 Change-Id: I525a10691b2e350f448763d331f8c4dcfdb6422c Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Qt5Compat: Adapt to restructuring of QUnicodeTablesAssam Boudjelthia2025-10-311-1/+1
| | | | | | | | | | case conversions are now separate from other properties. See commit 763f19151cc31ca1ba4912e0828359be5dba89e8 in qtbase. Pick-to: 6.10 6.8 6.5 Change-Id: I25c76db743d6c7093a9dbda3cb9c93c5c3576935 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Mark qcore5global.h as security-significantMarc Mutz2025-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It only contains macro definitions. I chose reason:header-decls-only as the closest match. This completes the review of qt5compat/src/core5: $ for i in $(find src/core5 -type f); do if ! grep -qE '^// Qt-Security score:' "$i" ; then echo "$i" fi done src/core5/CMakeLists.txt src/core5/doc/images/javaiterators1.png src/core5/doc/qtcore5compat.qdocconf src/core5/codecs/qt_attribution.json src/core5/codecs/LICENSE.QJISCODEC.txt src/core5/codecs/LICENSE.QEUCKRCODEC.txt src/core5/codecs/LICENSE.QEUCJPCODEC.txt src/core5/codecs/REUSE.toml src/core5/codecs/LICENSE.QBIG5CODEC.txt src/core5/codecs/LICENSE.QTSCIICODEC.txt src/core5/codecs/LICENSE.QBKCODEC.txt src/core5/codecs/LICENSE.QSJISCODEC.txt src/core5/configure.cmake QUIP: 23 Fixes: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: Ia4d4c52e5ecb0ec1556841b0b66e409715a54c1f Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark QBinaryJson as security-criticalMarc Mutz2025-10-159-0/+10
| | | | | | | | | | | | | | | | | | QtJson in QtCore is, too, so mark all .cpp files as critical. As for the headers: they're mostly trivial-impl-only (containing e.g. move SMFs), except for - qbinaryjson_p.h, which contains a lot of inline functions that help with parsing (→ critical), and - qbinaryjson.h, which contains only declarations (→ significant). QUIP: 23 Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I4f558f93103e54ec30794fd15daedd03190856bb Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark security header for the qt5compat importsSanthosh Kumar2025-09-2636-0/+36
| | | | | | | | | | | | Although QGfxShaderBuilder writes the compiled binary data from the implicit shader code to the specified file, it shouldn't be considered as critical. QUIP: 23 Task-number: QTBUG-140228 Pick-to: 6.10 6.8 Change-Id: Ie1174d30238b3359e4f7d204f5a5c20f43463d83 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Use declarative type registrationJoerg Bornemann2025-09-253-43/+0
| | | | | | | | | | Automatically generate QML plugin sources and qmltypes. Pick-to: 6.10 Fixes: QTBUG-100784 Change-Id: I3fef901817562404159b1109befd0be21c727b0d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
* Mark documentation files as security-insignificantMarc Mutz2025-09-2312-0/+13
| | | | | | | | | | That includes .qdoc files as well as snippets. QUIP: 23 Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I701c49578a872dd6c6e385d68ed3db0005522abf Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark remaining QTextCodec headers are security-criticalMarc Mutz2025-09-232-0/+3
| | | | | | | | | | | | | These headers contain macros and inline functions that are no longer trivial, and are probably used in many QTextCodec implementations. Some of this stuff could be de-inlined, so leave a comment. QUIP: 23 Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I8a7d7afd51b4ddab56c87ee42e5b3c0ab4c6aa01 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark most QTextCodec headers as security-significantMarc Mutz2025-09-2316-0/+17
| | | | | | | | | | | | | | They either contain only declarations, or only trivial implementation (like inline forwarders from virtual name() to static _name()). A follow-up patch will handle the remaining headers that don't fit these categories. QUIP: 23 Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I7f9035a8491de14ad57acf084f77604869ec484b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* De-inline ~QJpUnicodeConv()Marc Mutz2025-09-232-1/+4
| | | | | | | | | | | Destructors of virtual classes should be out-of-line, to avoid -Wweak-vtables, and all the complications weak vtables entail. Task-number: QTBUG-45582 Task-number: QTBUG-140401 Pick-to: 6.10 6.8 6.5 Change-Id: I6bf136d6c5f6b78829fbe179cf7f713d0e05cc68 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* QBinaryJsonObject: replace qSwap with qt_ptr_swapMarc Mutz2025-09-231-2/+2
| | | | | | | | | | Amends b4f927dc94f02a2fa7edd5ecb3ef1ab8bffaedd0, see that commit for rationale. Task-number: QTBUG-97601 Pick-to: 6.10 6.8 6.5 Change-Id: I06ab5f2a8e59f08846eade2cc97f531093477ee3 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark QLinkedList as security-significantMarc Mutz2025-09-222-0/+2
| | | | | | | | | | This class does not handle external input, so is significant (the default). Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I95cde0545782400bdbb0e53d5a559f28a1184f06 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark all QTextCodec implementation files as security-criticalMarc Mutz2025-09-1916-0/+17
| | | | | | | | | QStringConverter is, so these should be, too. Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: I2360bf3ae5ee280dd81f482999f4620c7ffd5134 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Inline cp949codetbl_p.h into its only userMarc Mutz2025-09-192-758/+739
| | | | | | | | | | | | | | | | | | | | There doesn't seem to be a generator that creates this file, so that can't be the reason to have it as a separate header. There's also only qeuckrcodec.cpp which includes the header, so multiple users, too, can't be the reason. Since there's no reason to have it as a separate header, don't. Inline the contents into qeuckrcodec.cpp. As a drive-by, make the table constexpr instead of just const. This avoids having to mark the file with Qt-Security headers. Task-number: QTBUG-135745 Pick-to: 6.10 6.8 Change-Id: Ie0487bc62ab2e88727bbfa442ab85549670bbf57 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark SAX classes as security-criticalMarc Mutz2025-09-183-0/+4
| | | | | | | | | | | | | | | | | | QDom and QXmlStreamReader are, too. The public header is trivial-impl-only, but the private one has some more implementation. I didn't check whether it's beyond anyone's limit for trivial implementation, because I think this header should be inlined into its only #include'er, qxml.cpp. Add a comment to that effect, and leave the header as "critical". Task-number: QTBUG-135745 Pick-to: 6.10.0 6.10 6.9 6.8 Change-Id: Ic02450967b483add4225e8c27c7b4b6eddb68640 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark QStringRef as security-criticalMarc Mutz2025-09-182-0/+3
| | | | | | | | | | | | QString and QStringView are, too. The header contains a smidge too much implementation to mark it trivial-impl-only, add a comment to de-inline such stuff. Task-number: QTBUG-135745 Pick-to: 6.10.0 6.10 6.9 6.8 Change-Id: I55a664d4e71ecf2bf754389a30ec13ee2e9b9e8a Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Mark QRegExp as security-criticalMarc Mutz2025-09-182-0/+2
| | | | | | | | | | | | | | QRegularExpression is, too, and, unlike QRegularExpression, this class does the pattern parsing and matching completely by itself (QRegularExpression hands it over to libpcre). The header only contains trivial forwarders between (char*, int) and (QString) overloads, so mark it as trivial-impl-only. Task-number: QTBUG-135745 Pick-to: 6.10 6.10.0 6.9 6.8 Change-Id: I65a9e2b521919d3f6eb604560bba701f46f8d0d8 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Doc: Fix incorrect usage of \generatelistTopi Reinio2025-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | The \generatelist command takes an optional argument that affect how the members are listed, for example, `classesbymodule` which creates an annotated list of the classes in a named C++ module. `groupsbymodule` is not recognized or documented. QDoc falls back to generating a list of all members of a group in this case. While the end result is correct, this relies on an undocumented feature that is likely to change and break. Replace these instances with an explicit \annotatedlist command that produces the same output. Pick-to: 6.10 Task-number: QTBUG-138901 Change-Id: I4486d19f59c6c1fd085f15a6a296226a6a8a20b0 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Add textual description for javaiterators1.png in QtCore5Compat docDheerendra Purohit2025-07-041-2/+2
| | | | | | | | | | Add textual description for javaiterators1.png in the QtCore5Compat documentation to ensure QDoc generates alt text. Pick-to: 6.10 6.9 6.8 Fixes: QTBUG-136146 Change-Id: I8474cbcf0900ea117e1e6e78aff8b8b2b985085b Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Doc:ColorOverlay Docs to use correct colorize formatDheerendra Purohit2025-06-191-1/+1
| | | | | | | | | | | The ColorOverlay documentation incorrectly stated that the color format is RGBA .The fix changed to ARGB as per the actual usage and QML color format specification. Pick-to: 6.10 6.9 Fixes: QTBUG-71541 Change-Id: If0ddacb1baba696b7095f6494629feb5cee78238 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* CMake: Add PURL and CPE info to 3rd party attribution filesAlexandru Croitor2025-06-041-0/+7
| | | | | | | | | | | [ChangeLog][Third-Party Code] Added PURL and CPE information to the attribution files of 3rd party sources. Pick-to: 6.5 6.8 6.9 6.10 Fixes: QTBUG-137188 Task-number: QTBUG-129602 Change-Id: I3b7282ae913af1028072825e0bae1a6927002535 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: Enable automatic linking to sources on code.qt.ioTopi Reinio2025-05-271-0/+3
| | | | | | | | | | | | Since 6.10, QDoc is capable of generating links to the declaration in the source code for each documented C++ API entity in their `Detailed description`. Add the required configuration to enable this feature for Qt 5 Core Compatibility APIs. Change-Id: Ic88dc5e1595c19e0a82aa6797ff300638d046e8b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qt5compat: use qHashMulti & qHashRange instead of QHashCombineThiago Macieira2025-03-191-4/+1
| | | | | | | | 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>
* Make module ready for source SBOM checkingLucie Gérard2025-02-288-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* doc: Remove ConversionFlags and ConverterState documentationAxel Spoerl2025-02-241-15/+0
| | | | | | | | | | | | | | | | | | | | 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 db733a992e52336527a880cddf27fc81695a11ec) Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* doc: Add qtquick as a documentation dependencyDavid Boddie2025-02-241-1/+1
| | | | | | | | | Task-number: QTBUG-133892 Pick-to: 6.8 Change-Id: I4b5458beeff4e5981c90b3332203769d08bab07d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 5a6b412bed018917f310175c8368fc65f5c1f45a) Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* doc: Remove invalid reimp commandsDavid Boddie2025-02-242-11/+0
| | | | | | | | | Remove invalid reimp commands. Task-number: QTBUG-133892 Pick-to: 6.8 Change-Id: I9d4da929456d702e0c204ec4f1c0875b3f0ec168 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Doc: Merge Qt Graphical Effects docs. Fix the treeAlexei Cazacov2025-02-171-2/+2
| | | | | | | | | 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>
* Doc: Merge Qt Graphical Effects docsSafiyyah Moosa2025-01-242-59/+28
| | | | | | | | | | | | | | | | | 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>
* QtSAX: replace QScopedPointer with std::unique_ptr useMarc Mutz2025-01-243-5/+6
| | | | | | | | | | 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>
* QRegExp: replace QScopedPointer with std::optionalMarc Mutz2024-12-181-2/+4
| | | | | | | | | | | | | | 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>
* QStringRef: preserve null-ness when converting to QAnyStringViewMarc Mutz2024-12-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* QStringRef: fix lost null-ness when converting to QStringViewMarc Mutz2024-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 80ffb97660907ab9a8d844b6c720e7c7fec0eb59. [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>
* Add REUSE.toml files and missing licensesLucie Gérard2024-11-061-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Doc: Enable documentation testing in the CITopi Reinio2024-11-042-0/+6
| | | | | | | | | Include documentation testing steps in coin/module_config.yaml and set the warning limit to zero. Task-number: QTBUG-130559 Change-Id: I31797453b155504ba7498dc87fc1fb511d0e88d6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QBinaryJson: increase compiler coverage of toString()Marc Mutz2024-10-241-10/+10
| | | | | | | | | | Instead of #ifdef, use constexpr-if to ensure both endian paths are seen by all compilers. Pick-to: 6.8 Task-number: QTBUG-130392 Change-Id: Id40769becdc68a20aee7d0dbc8fe7ca497a97384 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
* QBinaryJson: don't rely on old QChar ctor conversionsMarc Mutz2024-10-231-1/+1
| | | | | | | | | | | | | | Don't cast qle_ushort to QChar. The implicit conversion to int, which this relies on, has been disabled as of qtbase/9ef4c123c39c642357c9e8530d59f32f220a7824. Cast it to char16_t instead, which is the future-proof way to do such things. Pick-to: 6.8 Fixes: QTBUG-130392 Change-Id: Ie2691d4dca072b0da8af86e8df0b97c661d88f14 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
* QTextCodec: use DefaultConversion tooThiago Macieira2024-09-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complements dd0ddad631170e8825ea549eedc14c89712b0c1b and makes QTextCodec::{to,from}Unicode also use the flag. Same reasoning as that commit. The changes to the tests are to make it compatible with what QTextCodec did in Qt 5: the stateless fromUnicode() conversion did add BOMs, so we match Qt 5's behavior here. That includes conversions of empty strings, which QStringView() on a null pointer is. In fact, I think commit 3695cd090b7f490e941fa837b49f926514a82ddd is wrong in returning an empty QByteArray(). It went in because: a) the BOM behavior was different until the fix in this commit and in commit dd0ddad631170e8825ea549eedc14c89712b0c1b b) the test was not backported to Qt 5, which would have identified the difference in behavior I'm not fixing that difference in behavior because there's no Qt 5 code to be compatible with, as Qt 5 crashed when attempting to convert null pointers. The behavior of converting an empty QStringView() remains the same (just no longer tested). [ChangeLog][Qt5CoreCompat][QTextCodec] Fixed a bug that caused QTextCodec not to write the Byte Order Mark for UTF codecs. QTextCodec now has the same behavior as Qt 5.x. Task-number: QTBUG-122795 Pick-to: 6.5 6.7 6.8 Change-Id: If05cb740b64f42eba21efffd17d13d0145f74945 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: Remove usage of defunct QDoc commandPaul Wicking2024-08-261-2/+0
| | | | | | | | | | | | | | The QDoc command `\tableofcontents` was rendered useless by a change more than a decade ago. Remove the use of `\tableofcontents` as it serves no purpose, and ensure that the surrounding context still makes sense for the reader, by removing preceding text that refers to a non-existing table of contents, such as `Contents:`. Task-number: QTBUG-128173 Pick-to: 6.8 Change-Id: Iffc678763ae84efbdcfde21522a6117454fde0a9 Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io> Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* CMake: Annotate some targets with SBOM informationAlexandru Croitor2024-07-111-0/+2
| | | | | | | Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: I207025f2366f2b2bdbc06ca5222735e20f98cf02 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* QText{En,De}coder: use DefaultConversionThiago Macieira2024-04-101-2/+4
| | | | | | | | | | | | | | | | | In Qt 5, the flag to write the BOM was a negative: if IgnoreHeader wasn't set, we would write it. That was the default in Qt 5 because DefaultConversion was 0. But now it's a positive flag, DefaultConversion was updated to set it, but we forgot to use it in the constructors of these two classes. [ChangeLog][Qt5CoreCompat][QTextEncoder] Fixed a bug that caused QTextEncoder not to write the Byte Order Mark for UTF codecs when the constructor without explicit flags was used. Fixes: QTBUG-122795 Pick-to: 6.5 6.7 Change-Id: If1bf59ecbe014b569ba1fffd17c459af4e0e00c9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Use NO_GENERATE_CPP_EXPORTS explicitlyAlexey Edelev2024-03-251-0/+1
| | | | | | | | | | Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need the autogenerated exports header file. Task-number: QTBUG-90492 Change-Id: I9476dff5af1cc6c042b406cfda501ec874014083 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Correct license for tool fileLucie Gérard2024-03-151-1/+1
| | | | | | | | | | | | | According to QUIP-18 [1], all tool files should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I349ce25d8713aa7834317fc8460952b7bfb2c5fb Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Correct doc snippet and example licenseLucie Gérard2024-03-158-8/+8
| | | | | | | | | | | | | According to QUIP-18 [1] all file under snippets or examples should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I58b6175b10be2463d4bc8034ad08432e0b3e77d7 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Documentation: fix two typosThibaut Cuvelier2024-01-081-1/+1
| | | | | | | | "binded" is quite rare in the documentation, I could only find it four times (included this one). Change-Id: If951959b5d03488b6bee3e91bab6e7f9a54a2fd4 Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* Documentation: fix the only use of \inlineimage with \captionThibaut Cuvelier2024-01-081-1/+1
| | | | | | | | | | The author most likely meant to use \image, based on the HTML render at https://doc.qt.io/qt-6/qml-qt5compat-graphicaleffects-gaussianblur.html. Also, this case generated invalid DocBook output. Change-Id: Ib399f58e242211be0d677979676cff7a0e8bf458 Pick-to: 6.7 6.6 6.5 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* Improve documentation of QStringRef::compareJaishree Vyas2023-12-121-37/+36
| | | | | | | | | | Same as other compare() overloads for consistency and better understanding. Pick-to: 6.7 6.6 6.5 6.2 Task-number: QTBUG-114822 Change-Id: Ie847a26adfd2367bd4601611dca42183da8f24ab Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Doc: Fix \fn template arguments for Qt 5 Core CompatTopi Reinio2023-11-271-1/+2
| | | | | | | | | Upcoming changes to QDoc require accurate definition for template arguments in \fn commands. Task-number: QTBUG-118080 Change-Id: I7fd9f657439e2cad0f54b0b514c04a19e2d65df3 Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* QTextCodec: retain input's nullness on {to,from}UnicodeVolker Hilsheimer2023-11-071-2/+6
| | | | | | | | | | | | | | | | | | | Bring back compatibility with Qt 5.15; return a null result if the input is null, and an empty result otherwise. Amends 3695cd090b7f490e941fa837b49f926514a82ddd, which returned a null- result even if the input was an empty string of zero length. Add test coverage; running this test case against Qt 5.15 results in the test passing, with expected failures for the case of a nullptr input. These are objectively wrong if the goal is to retain nullness symmetrically, but the Qt5Compat library's purpose is to provide behavior that is identical to Qt 5.15, so leave those expected failures unfixed. Fixes: QTBUG-116981 Pick-to: 6.6 Change-Id: I8fa0f10258752446966055ad4ce8b99688b66104 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>