This reverts commit 5c95d69da3.
The revert is needed for the Qt 6.8 LTS opensource releases.
They cannot contain commercial SPDX license identifiers.
Task-number: QTLTSOSS-264
Change-Id: I45ed63541735c9b0d9e158bb28e8acd28cefbee0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Add alt text to textfinder-example-userinterface.webp in QtUiTools docs.
Resolve missing alt text issue and improve accessibility.
Fixes: QTBUG-136158
Change-Id: Id9056dd5cbe0c385cb7a4d3f7bcfdc56a46fc6f7
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit ef4f263201854161d02f2a86ed1e270d3dc93df0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit c1219aac76e0f788b5e1b760b211e9e8fa9cbcf1)
(cherry picked from commit d7b091e1a4468affb2f8763f4bfa427f297f226c)
The second argument to \page got already removed in 5212645b46.
Remove the last traces of it alos from the overview.
Pick-to: 6.5
Fixes: QTBUG-138072
Change-Id: If2d18d5c493347fec1d62765fbede2bf8188847f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 99c4bce7a32ae25e7d107ce739ba409b7ddf15bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7b6f3f2a0adad918c5d94d7ec93602fc17e8eb00)
(cherry picked from commit 1922ead22124e7de0040ced04169d04a1c421da3)
Add a capability of testing features enabled via command line arguments
passed to QDoc in data-driven tests.
Additional arguments are read from an optional `args.txt` located in the
same folder as the main qdocconf file.
Task-number: QTBUG-136115
Change-Id: I801144a385d19b3ffeffa12db6716fdca5146a51
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit bbbf1ad606f2ba0b244ed609d746408a3d25f30d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 64f2acae3d330f530d1bf241bb31257184ec9995)
When constructing a link to a Node that lives outside the project
currently being generated, QDoc checked whether the link target is an
"index node". If so, the href of the link was prepended with
`../<project-name>` of the target Node. This works as expected in normal
operation.
However, in single-exec mode, testing for index nodes is always false,
as nothing is loaded from index files. This resulted in incorrect
links unless all documentation projects that are part of the same
single-exec build were configured to use the same output (sub)dir.
Fixes: QTBUG-136115
Change-Id: Id6624c52f5190e521cecbfc3176f8ac066590daf
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit c1ac8008b8b6181f2b8e6b48cea2c41fc6f31073)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 300b0339441ce837e4497a89d45f3cc92637f911)
Updated the commercial SPDX-License-Identifier to
the source files. Examples, tests, documentation,
or build files are not updated.
Modified licenseRule.json and REUSE.toml accordingly.
Removed unsued license text files under LICENSES.
Task-number: QTBUG-136484
Change-Id: I8d2db0369a3c5747ed818bc14165d3fefbb09452
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
As it stood, we would search for a label's buddy from the top level
widget and down, based on the object name. The problem with that approach
is that since the same form can be instantiated onto multiple widgets
inside the same window, there can exist multiple buddies with the same
name as well. As a result, the form builder would end up resolving the
same buddy instance for the all the form instances.
Rather than searching for the buddy top-down, this patch will instead
search for it bottom-up. We assume then, that the buddy closest to
the label is the correct one to use.
Fixes: QTBUG-96693
Pick-to: 6.5
Change-Id: Iae7c8865563304810ed5f905c6ad45d7b796b7a5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 1c121ea7ab4791bf26759013c1a77eac9d76e3c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e3cc2b1f8de7c31553cb728642dd06e690ef1d0c)
(cherry picked from commit 5895269bf765ff1f01f6fca22a15a6f5e04a9b4b)
[ChangeLog][Third-Party Code] Added PURL and CPE information to the
attribution files of 3rd party sources.
Fixes: QTBUG-137261
Task-number: QTBUG-129602
Change-Id: I59376a45727f49ef4ebce85777cb294120cbb8dd
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 41d599f817aeebe1086f9bcdf8d97e0230d3435b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit dc3c1708cfddb4751a95861e3af914a513f79628)
QDoc's `\l` command accepts QDoc macro as the link target, and will
expand the macro in place before linking to the target. As multi-word
targets must be wrapped in curly braces, macros that expand to multiple
words (i.e. a string that contains spaces) must also be wrapped in curly
braces.
This commit adds a test case to QDoc's end-to-end test that verifies
QDoc's ability to link to macro expansions using the `\l` command. The
test serves as documentation of this functionality and prevents future
regressions when modifying QDoc's link processing.
Change-Id: I29efc9b419569946e5dcf7d64dfea3319944092a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit d94abd53078a6e12a6c5fad3e2adb71338dd2080)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9d148b283e5ffbf19c04da8ac9a0e7d052ca9013)
When reading a newer version, use only the horizontal value.
Task-number: QTBUG-17730
Change-Id: I3514ae0575368085344a3095c8025f66ee337167
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 0076b93457f77f936daf61936ba7a1f45d487327)
(cherry picked from commit 72676f45f9ac1ad5383c7650a2e823a5dab505cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
When using the Xcode generator, the custom command created by
qt_add_lrelease needs to be driven by exactly one custom target.
We have code that attempts to do that by assigning the driver target
name to the _qt_resource_target_dependency property, which is then
processed by _qt_internal_process_resource.
It's not sufficient to set the property in the directory scope of the
legacy_target, it needs to be set in two places:
- in the (non-legacy) lrelease_target directory scope
- and also in the directory scopes of the targets processed by
qt_add_translations
The latter is needed because qt_add_translations is usually deferr
called in the root directory scope, but each processed target might be
creating the resource in a different directory scope, where the
property would not be available.
Extract the common code into a function, and use it for both mentioned
cases.
Piggy-back on the test_i18n_subdir tests and rerun them with the Xcode
generator, to verify that the fix works.
Amends 5b0e765ab0
Amends 94bb328a17
Augments c700597cfe
Fixes: QTBUG-136736
Task-number: QTBUG-103470
Task-number: QTBUG-117406
Change-Id: I6c7fac4f988dbd8289ac47c50912b4733559fbdb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 353716dfad147c014c31fdc9f10759f599a7ec09)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b27c7440ebb5acd1fea797955d2545a51fbf080d)
Split out QDesignerResource::applyProperty() from the loop
for single properties in order to be able to better
handle legacy properties with different names.
This is the base for adding a change enabling the 6.8 LTS
designer to read the new format.
Task-number: QTBUG-17730
Change-Id: Iffe8ce3b531e13d1854cff60701cee5ebb289be4
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 39b98747a0971892c006ce36b4d4bc860d50324b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 96c1a38b1ddc0d4f49d46b1f5e2ea9ed64327af5)
Updated the tqtc repository the dependencies.yaml
for the LTS Commercial releases.
Change-Id: I609508cf803ef60ba22a16491b3c0b867ea6686b
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
CMake tests that call qt_add_translations or
qt_add_lupdate + qt_add_lrelease and run the update_translations target
during the build, were prone to race conditions.
Move the build of the update_translations target out of the project's
build system and call it by a post_build_check.cmake script. This brings
the test projects also closer to the real world.
Change-Id: Ie583899012a24fe02e41b67400f6f5741b479510
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 429081ab11e647da172750055c2e5c074d2670dc)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 9e413d0b6db7100883be8e7b7a79581c4fa401d6)
There are different states that a module can be in, for example, an
'active' state, a deprecated state, marked for deprecation, or a custom
state that the user can define.
Whilst the \modulestate command can be used with an argument, for
example, deprecated, QDoc will not actually deprecate the module. It
will just generate a sentence on the module page. This can cause confusion
for the user.
This patch expands on the \modulestate command and explains that it can be
used for custom module state descriptions. A note was added to state
that it should not be used to actually deprecate a module.
Fixes: QTBUG-133739
Change-Id: I4d439a59d6f4fbee4506ea2a297df107853992da
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit 78be281374fcc6959f4d386ec7b08d1cc90c0422)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2f05f79763365aed12a0522f32079827efca40e4)
CppCodeParser::processTopicArgs() returns an FNMatchError instance
when QDoc fails to tie an \fn signature to a declaration in a
header. Fix a bug where these failures were ignored, as they were
not appended to the `errors` vector.
Fixes: QTBUG-134250
Change-Id: I15377c3ab4707baf652757bb33ac8db9810274b3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit ed955406e33a3e3d4d619382f23311bad5535501)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2156f69625350983eb61d8216c5358d309d8c4bc)
While reviewing the code in QDoc's HTMLGenerator class, I found some
minor whitespace issues that I fixed as I passed by. This patch is the
result of that cleanup.
Task-number: QTBUG-92109
Change-Id: I3084f7376c98db05092311686db77f4c271c3dd6
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 5f4961df7d69bd67742120da3964a4c3348f8f6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7fbabe718636da509f722e7b794759bd53cefb62)
This unblocks two things:
- updating llvm to 19
- updating macOS to 15
The actual fix needs further investigation.
Task-number: QTBUG-130006
Task-number: QTBUG-130096
Change-Id: Ic2f5899d330ef448b86d21b9eba031cbd61dc0b7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 94d8e9ab02ba6af6724e31ad215461cd12413618)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Location::report() was pushed directly to stderr without decorating the
message in any way. To have unified formatting with other message types
(error, warning), prefix reports with 'qdoc: '. In addition, output the
project name, to disambiguate between similar reports in a multi-module
documentation build.
Change-Id: I7696f23d79d175c926efbf7cba3ced457d9a53df
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit ebab8cd15995af4a72314b1a5c19ebbee5227c68)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 18d477f43c411b428bfba823aa164d10a3e644d5)
`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.
Task-number: QTBUG-132604
Change-Id: I1a1896ed0fd676101940dadcee5e1641440ec7c2
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
(cherry picked from commit 8bf44c671cde33abf097770e3e2acfcd00aac99a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3485806d8075e0b6ecfb25b0b79303bb1206ad30)
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
Change-Id: I7b3613e2bc071be47197e86fcb17af3a9fd62462
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 08342b6465901893a1c2be7694af0802cd505f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 046658ae1d4afbc83d92dff05aa594df3abfc085)
This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding exception to the licenseRule.json files
- correcting the licensing given via REUSE.toml files
- renaming license files not located in LICENSES folder.
They need to be named LICENSE. to be ignored by reuse and
excluded from the source SBOM. The name 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 correction 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
Change-Id: I668dad0c545b6559c2263a4d60928e6878db838f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 119802c61832c53ccdc435141f3442a777457045)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0227127686d24ddb38c98f59c02c6c3d4e548cd3)
