summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Fix code preview not working in PySide6 on Windows6.6Friedemann Kleint2024-03-201-1/+17
| | | | | | | | | | | | | | | PySide6 installations do not have a proper Qt directory structure on Windows; so, uic is not found via libexec. Use the path of the application instead, which should work in all cases. Fixes error Unable to launch ...\Lib\site-packages\PySide6\bin\uic: Process failed to start: The system cannot find the file specified. Change-Id: I841836a89962f4db962816453b9e99f33ffaf86b Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c9b04d4597713a9751b268f30744b4c3cac4ad58) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 7c85c38bb8c392f228f5c3f87cba6b8ba729274d)
* Documentation: Update the list of file formats supported by lupdateFriedemann Kleint2024-03-191-2/+3
| | | | | | | | | Pick-to: 6.5 Change-Id: I592b8d8247df86dfd3b5e28956de5150259e8f6e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d8b0224fbfb6e9a3845c19e4ccdce2586d487884) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 165dfa016647600c7bd198eb787acbe4b7499df5)
* Qt Designer: Improve code previewFriedemann Kleint2024-03-181-1/+6
| | | | | | | | | | Set a fixed font and make it big enough to accommodate 100 characters. Change-Id: I4f0353b33f344e92772cd659141e987d3d132659 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 3c85ecb1eeb382158fffed8dc6bc02e4bbfabb13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 044307cfdcae9ecc044fe9aed743102bee21e772)
* Doc: Avoid 404 links to https://spdx.org/licenses/Kai Köhne2024-03-151-1/+2
| | | | | | | | | | | SPDX ID's starting with "LicenseRef-" are local. Pick-to: 6.5 Change-Id: I383448e22e4f5eb751e089ae4ec618985864db26 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2070c94858cd31b1820442461d52b30eae856cf9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8f7b1bdb5f2ff1c02d184375379da58022553c34)
* qhelpgenerator: Fix evaluation of timestampsMarcus Tillmanns2024-03-132-4/+8
| | | | | | | | | | | | | | | Amends f11d7e4af73ca474ab71310961b155f6c9bc71da and b860d48aabfe43d1eb3c9c1c10bd3698d367c255 to correctly parse and compare timestamps. Fixes: QTBUG-122994 Change-Id: I1fb12200ef6fc1fdc58dd629d92a7c39e14ca29e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> (cherry picked from commit 2ec42bc0981c339780d280b6d93ff5fa7c018ea9) Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit eeecb35cadf747c845b047b110172c6ff8d619b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Warn when generating a file multiple times per projectPaul Wicking2024-03-052-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | When generating documentation, QDoc may overwrite files that exist in the output directory. This behavior is wanted; previously QDoc warned for each overwrite, making the warning count between multiple documentation builds not representable. However, users rely on QDocs traditional warning output and are unlikely to notice debug log messages. This change makes QDoc issue a warning when obtaining a file handle for an output file if that file is known to have been generated previously in the current execution. It also introduces a new environment variable `QDOC_ALL_OVERWRITES_ARE_WARNINGS`, to allow the enforcement of QDoc's past behavior of unconditionally warning instead of debug logging these events. The QDoc manual is updated accordingly. Fixes: QTBUG-121437 Pick-to: 6.5 Change-Id: I834027201197039bb4591e633bf72845e8a4343c Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 54e5d595b7400730546335ffa02bf2ea95b2fcef) Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 35860c9c196f1f6174f7c0601edb1ed3fb5c5a64)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-03-031-3/+3
| | | | | Change-Id: I5c6aeae28d7fdda298a79956eb2b5fbe29a4fefa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-271-3/+3
| | | | | Change-Id: Ied356e6ca91d54d000f31f9ffeafff3e7c6bae44 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Respect line continuation charactersPaul Wicking2024-02-2610-6/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a refactoring (d7eeb6b0f78781cac8b87f4f18894aca6a467ae6), QDoc no longer parses trailing backslashes immediately preceding a newline character as line continuation character correctly, in that content in the continued line is duplicated. This is due to the refactoring not properly updating the position. The refactoring caused another side effect, addressed in d988115e061622e2c7728e83295727be9303a1c3. That change caused a new side effect that may cause leading and trailing whitespace characters in a continued line to end up verbatim in the continued line. This change seeks to address these two problems in the following way: - Ensure the main loop of the method updates the starting position for the line of text at the end of each iteration. - If a trailing backslash has been encountered, return a simplified string. This ensures that sequences of internal whitespace is replaced by a single space character. - Change a local variable name to better reflect what it represents. - Update the documentation for the method to account for the behavior change. The reintroduction of `simplified()` return values may possibly have unintentional consequences. For example, it may impact parsing of regular expressions, as seen as side-effect of the original refactoring. Fixes: QTBUG-118558 Change-Id: I5bbf51b1923a5e04f324c3f92aeb1cceff8aab7c Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 951a9dab91e8982fd8e6b01bce9ff58e2028aa1b) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-261-3/+3
| | | | | Change-Id: I4d1b343b73b6bbc17ff2342d93e178840e262f01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-221-3/+3
| | | | | Change-Id: I49029aa2d3471a02e136eb2c620fc37bc7c67ef1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-201-3/+3
| | | | | Change-Id: I283dbde1811a05ab92b3006a20916605d0dcd11b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-161-3/+3
| | | | | Change-Id: Ic33790e08dc8c74b64160360f3118e55cac1d21d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove 'Internationalization' categoryKai Köhne2024-02-154-4/+4
| | | | | | | | | | | | The category is too small. Merge it with the 'User Interface Components' category, as translations are mostly used in this context. Change-Id: I619aba35368773ca52b85f6778f96bae24839402 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> (cherry picked from commit 28b08f62cfd9dab47e1a668570bf1fed95ff8687) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e981fe0f3d5f3d44afed56d9eef38976e1ef4203)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-151-3/+3
| | | | | Change-Id: Iacdbe105e72eb31e45c1d6ab0464ce98be34af6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove year from generic Qt copyright informationKai Köhne2024-02-145-7/+5
| | | | | | | | | | | | Don't change any tr() strings though to not break translations. Task-number: QTBUG-121906 Change-Id: Iede7050c6850bf828cdfbcf90e6d597d86557d20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2f619974b4cb9527634ec9c9b60e3d47902ce76e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 99ca7e33f946b1e0d001b95c344d2d8286bb82b1)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-131-3/+3
| | | | | Change-Id: Ibd022afa8514bc9ec93f5d2676f9b79cf4fbb692 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-091-3/+3
| | | | | Change-Id: I84b091c40b1155d9d681d4d22b115d94536f0631 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Don't change state when command doesn't applyPaul Wicking2024-02-091-2/+3
| | | | | | | | | | | | | Ensure that state isn't changed if the requirements for COMMAND_QTCMAKEPACKAGE are satisfied. Pick-to: 6.5 Change-Id: I791c8e323dd430efcbeb448e76a27e2ffe305b3f Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 68d77bfe9286f5c52679916ba1503424f3cd076b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 02b8f03d53bfbb4f95c8c7685d1a568f11bcf563) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-02-061-3/+3
| | | | | Change-Id: I42c7fd4714491d04f815d5367b3eed03cf906051 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Ensure help project QHP SHA1s work cross platformPaul Wicking2024-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc can generate Qt Help Project files (`.qhp`-files) through its `HelpProjectWriter` interface. When it does, it also generates a `.sha1` file for the generated `.qhp` file. The SHA1 hash it generates on Windows differs from that it generates on other platforms. This issue was uncovered when restructuring QDoc's tests for the files it generates. Upon investigating the problem, the initial hypothesis was that it was possibly caused by differing line endings on different platforms. This theory led to the discovery of a forum.qt.io discussion about a similar problem: https://forum.qt.io/topic/124177/qcryptographichash-results-mismatches/3 The forum discussion suggests dropping the `QFile::Text` flag when opening the file for writing. Indeed, the documentation for `QIODeviceBase::Text` (the implementation of said flag) states that "When writing, the end-of-line terminators are translated to the local encoding, for example '\r\n' for Win32." This means that on Windows, the `QFile::Text` flag can cause line ending conversions when writing files. Dropping that flag when opening the output file ensures that the data is written without any automatic line ending conversions, thus the result should be consistent across different platforms. This means QDoc must open the hashFile in binary mode by not passing the `QFile::Text` flag. The reason for this is that, on Windows, the `QFile::Text` flag can cause line ending conversions when reading or writing text files. Validating the fix is challenging, as `HelpProjectWriter` isn't covered by any unit tests. However; the change that follows this makes use of the QHP-generating capabilities of QDoc in a test, and serves to validate this fix. Fixes: QTBUG-121850 Task-number: QTBUG-119500 Pick-to: 6.5 Change-Id: I9c3c2242c7698e1b7bc031dd33cdbd305d96c713 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 473fbb486926ba8629447d2b91483d982075b4fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8dcf9dd90d0225ca4a1712a78bcfce7389c9b19a) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-01-271-3/+3
| | | | | Change-Id: I73487ff6e2061ce54715c9e251bc9700e455ffd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.3Jani Heikkinen2024-01-271-1/+1
| | | | | Change-Id: I8d4659b3bd3840da83e8a6e0cc29a4f1b19daf97 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* CMake: Don't pass .qm files to lupdateJoerg Bornemann2024-01-261-0/+10
| | | | | | | | | | | | | | | | | | | If a target has .qm files in its sources, we passed those .qm files to lupdate as input. Lupdate then transfers the translations in the .qm files to the .ts files, which leads to translations that don't have corresponding source lines. We now filter out .qm files from lupdate's input. As drive-by, we also filter out all .json files which don't contribute to i18n. Pick-to: 6.5 Fixes: QTBUG-118808 Change-Id: I06563c0029dd50811dd0a04b04eb63d660e44eb2 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io> (cherry picked from commit 666e7ad35a83c85bcbb531ea01d2257ebea2bdfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 4659b576ae67f97d0bdd48d209298b35f5e315ed)
* CMake: Don't pass generated ui_foo.h headers to lupdateJoerg Bornemann2024-01-251-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | If the user has added foo.ui to the target sources we passed foo.ui and ui_foo.h to lupdate. If foo.ui is id-based, ui_foo.h is generated without context and source text information, and the created .ts file will contain a name-less context. We're now filtering out ui_foo.h if foo.ui is in the sources of a target. This ensures that we'll have the correct id-based translation generated from the information in foo.ui. Note: If the user relies on AUTOUIC's feature that autodetects ui_foo.h without having foo.ui in the sources, we still have the described problem due to the lacking information in ui_foo.h. That will need to be fixed in uic (to generate the context and source info) and lupdate (to pick up context information, which isn't currently possible). Fixes: QTBUG-118808 Pick-to: 6.5 Change-Id: I05a6eec3ed601908429672ee6edaf38209ebcd71 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d52c7a8864f2f5d2806728f1a04a033abce5b6dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 22f3c6ac535afb217f6d3a26a5b74c4d5b29f287)
* lupdate: Add support for template literal as translation source in qml filesLucie Gérard2024-01-243-6/+20
| | | | | | | | | Task-number: QTBUG-120531 Change-Id: I8a4ede2e1fbd79e4764e4ef3438e18d7d73ee204 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit e92e844a570874ab38a6204787667da8d087480b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c18fde59329f3e9957915e6d5fc57c2504b12907)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-01-221-3/+3
| | | | | Change-Id: I5ce32f0c3b20c09417375a1e11659ff22c16370e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Minor fixes in the QDoc manualPaul Wicking2024-01-192-14/+10
| | | | | | | | | | | | | | | | | | | The QDoc manual contains incorrect syntax for the use of QDoc's `extraimages` configuration variable. This change corrects the mistake. As "drive-by" change, the surrounding text is modified to make it clearer. Inspecting the documentation for the `stylesheets` and `scripts` configuration variables (they're mentioned in the bug report) exposed another oddity in the manual, which is also addressed herein. Pick-to: 6.5 Fixes: QTBUG-121226 Change-Id: I94e37b29de20dc932a2de532d6e5a4f4a7d36512 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 55bf738c007582ce771bc10ce45298f6d68375f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 0407d3e3008d8e26b8195e75ff1ad6f5fd50350e)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-01-181-3/+3
| | | | | Change-Id: I30f509efa4dc576fbdf8d251cb5c6959cbad9fa6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* liguist: add support for segmented target in XLIFFLucie Gérard2024-01-174-1/+81
| | | | | | | | | | | | | All segments of a translation target are now retrieved. The spacing between the <mrk> is preserved. An auto test is added. Task-number: QTBUG-119051 Change-Id: I16aedcf911642a3372e9676a9896bff39ee99f60 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit e96c9e98bc4004063fa93dcf9ccce4997ddb1fdd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 1081b84a1c540b5c9c392ef1267eb328d06f97ca)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-01-171-3/+3
| | | | | Change-Id: Ia001436c238eb5737f1f317e66d5068eaf30be0b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix misleading variable name in i18n exampleJoerg Bornemann2024-01-161-4/+4
| | | | | | | | | | | Rename 'qmlFile' to 'qmFile', because it contains the path to a .qm file. Change-Id: Idcd195e8fb7f3d5985cc46fa98a3f12589ff59e9 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 3bafced88a63d67a33ca1762123fbf5c68c0699f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 941103bade8ff521e73005ea119c108437a0836a)
* Qt Designer: Fix mode switching position logic for multiple screensFriedemann Kleint2024-01-112-13/+11
| | | | | | | | | | | | | | | | The logic tries to maintain the relative form positions when switching from top level to docked, but used the primary screen as a reference point. This caused the forms to be out of the docked area when on a secondary screen. To fix this, use the widget's screen to calculate the position. Task-number: QTBUG-120236 Change-Id: I51856cdedd6a3f2c2ec73d94c0f726c04caaabca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0c376fd83a8a9c0853d50753ee677fd40235d208) (cherry picked from commit 5a9c4ee7d0d2cff1b868b39ca90d02ca8745111a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Start where mouse cursor is in Top Level modeFriedemann Kleint2024-01-111-3/+15
| | | | | | | | | Task-number: QTBUG-120236 Change-Id: I0471794c0250484cfd15772d1c6bbeab201ef4e2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b27c8730175db14abb539dc949010ba90768a6de) (cherry picked from commit ddde0ac7854740670d61ac3a08056ed29bd5a3f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qhelpgenerator: read file modification time in UTCJames Addison2024-01-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During help collection construction when the SOURCE_DATE_EPOCH[1] environment variable is set, each file modification timestamp recorded in the TimeStampTable is clamped (capped) to a maximum of the value specified in the environment variable. The SOURCE_DATE_EPOCH value is an offset in seconds from the Unix epoch, and is relative to the UTC timezone. Therefore we can avoid some timezone conversion operations and make it clearer in the code that we are comparing UTC-with-UTC by adding a timezone argument[2] of UTC when calling lastModified to retrieve the modification timestamp for each file. This argument is available in Qt 6.6 onwards. This change is not intended to produce any functional change in the behavior of the code; instead readability/comprehensibility and, to a lesser extent, a performance benefit described by QTBUG-100349 when reading UTC-native filesystem timestamps are the two reasons behind this change. [1] - https://reproducible-builds.org/specs/source-date-epoch/ [2] - https://doc.qt.io/qt-6.6/qfileinfo.html#lastModified-1 Task-number: QTBUG-62697 Change-Id: Iffb1aed5ee326ed40acb6285078c6682f76750c8 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit b860d48aabfe43d1eb3c9c1c10bd3698d367c255) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit e2e750bfaa32362c8d9730fbd2bd35663722792f)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2024-01-081-3/+3
| | | | | Change-Id: I4c0b95eb7d9def75a20dd0a1343c92bd11f072d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer/QDesignerWorkbench: Refactor functions for geometriesFriedemann Kleint2024-01-082-29/+20
| | | | | | | | | | | | Replace desktopGeometry() by a screen() helper function and rename availableGeometry() to availableFormGeometry() for clarity. Task-number: QTBUG-120236 Change-Id: I1756df68de0960ea92bcaa0e51ea1a7980da727e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ffffeedf9ab1d537dab3b95969ee6b6681cb14ff) (cherry picked from commit ba5e7f413c6d40638a9e6d8df8a9634d9e1a830f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Simplify top level geometry calculationFriedemann Kleint2024-01-083-37/+16
| | | | | | | | | | | | Pass the available geometry to QDesignerToolWindow::geometryHint() which allows for removing some functions. Task-number: QTBUG-120236 Change-Id: Id37ff342fa380b6789312124834180b5f01833ac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 6aa71e6259dbf88d8d236f72020d265ddd48adfd) (cherry picked from commit 6182239e52579cf58299c10a5e9392beaed8a64a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/QDesignerWorkbench: Fix a few clang-tidy warningsFriedemann Kleint2024-01-082-17/+18
| | | | | | | | | | | | - Use auto * - Narrowing integer conversions Task-number: QTBUG-120236 Change-Id: Ia9052fffda53d14ef83b1bdf874e55a3bbc89625 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b3e97845ae1bbf6912e6080ad68abb6586425208) (cherry picked from commit 1bf4dd1ab2b1283eec642e34c513e400b98204e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Replace QDesignerWorkbench::marginHint() by a constantFriedemann Kleint2024-01-063-12/+2
| | | | | | | | | Task-number: QTBUG-120236 Change-Id: I0039e1454f1783a974410637a400f1a5f25a1697 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit cc812731fa2ae7f2757cd64867c3b90dc0decfdb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 60e5b99d067bcb28f7ae2a6ac371f300bf03e24e)
* Qt Designer: Change the settings keys to be latin1 string literalsFriedemann Kleint2024-01-051-20/+20
| | | | | | | | | Task-number: QTBUG-120236 Change-Id: I9ec291672afc31900c74833367a27ff460dba848 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 27dc5ba5a9c96b6e1c3ffdf538fcc815f2e0fd65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 29a4460ba942f18609bb6464c1b1470942f1c60b)
* qhelpgenerator: localize SOURCE_DATE_EPOCH to UTCJames Addison2024-01-012-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The SOURCE_DATE_EPOCH environment variable is used as an anchor timestamp that software builds can use when they embed timestamps that refer to the build-time into their build artifacts. The value of the variable is specified[1] as an integer number of seconds since the Unix epoch (1970-01-01T00:00:00Z). To ensure that the value is interpreted correctly, and to ensure that the resulting timestamps embedded by qhelpgenerator cannot drift with the build environment's timezone settings, we should store the SOURCE_DATE_EPOCH in QDateTime instances that have a UTC timezone. [1] - https://reproducible-builds.org/specs/source-date-epoch/ Task-number: QTBUG-62697 Change-Id: I24a79088886adf9334cd7c3c6f723eb9f064007d Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit f11d7e4af73ca474ab71310961b155f6c9bc71da) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 20be13855f78bf1c5110997c1ce8baf6c1123cdc)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-12-251-3/+3
| | | | | Change-Id: I24e03ad5897c439264a03b2609e590ad597e6e96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use BSD-3-Clause license for CMake filesKai Köhne2023-12-197-7/+7
| | | | | | | | | | | See also https://contribute.qt-project.org/quips/18 Pick-to: 6.5 Change-Id: Ie7b9240cd128042d66685f8c53a2b3cb7fdf82a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 60ac82832d7ea545b572131d86efa6449550cb36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit bc94d0a3a971b5262e7936ee9b534ad8e1abe581)
* recolordocsicons: Add the tool and a READMELeena Miettinen2023-12-192-0/+108
| | | | | | | | | | Move the recolordocsicons.py script from qtcreator to qttools\util. Change-Id: I64b0ef7204ebe6334527dcd800fa5530bbd0e325 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 04170761698b298a1d8df2f380d787293ada5635) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 418d26c029e90d17b0d06a46dd9c313a1c28f097)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-12-191-3/+3
| | | | | Change-Id: I14891122bf264c0f8ecf0a8284b7be8c6202ab6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add link to Qt Design Studio in Qt Designer Manual pageAndreas Eliasson2023-12-151-9/+11
| | | | | | | | | | | | | | | | | | | | | | This page is one of the most visited documentation pages but, according to Google Analytics, it has very little user engagement (time spent on site, amount of scrolling, and so on). It could be that many readers are, in fact, looking for Qt Design Studio or Qt Quick related user interface design. Even though there's already a \note section after the first paragraph that informs the user about user interface design with Qt Quick and its benefits, add one more link to Qt Design studio and Qt Quick at the beginning of the paragraph to allow the user to quickly access these topics. Fixes: QTBUG-119886 Pick-to: 6.5 Change-Id: Ie10d65537a16cf17cd2b1f6138f262ca566a7b5a Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit c7b25190d804f0a6751b57b2e4694976b2d2f6f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit c740fcb6fef1d042d3a532d0d98729642e89640e)
* CMake: Fix qt_add_translations in different subdirs for VS generatorsJoerg Bornemann2023-12-121-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0338a2f7523e1fe21be325e76f6aba6b0c9e4467, was supposed to fix QTBUG-115166: XXX_lupdate targets were always run when using a VS generator. The fix introduced the regression QTBUG-119555 if qt_add_translations (or qt_add_lupdate) was run in different sub-directories. We were hitting yet another restriction in the VS project generator and project configuration errored out with: TARGET 'update_translations' was not created in this directory. This happened, because qt_add_lupdate added a PRE_BUILD step to update_translations, but for the VS generator, this must happen in the same subdirectory. We now work around this problem by building foo_lupdate with "cmake --build" in the COMMANDs of update_translations. As a consequence, we must create update_translations at the end of the project directory scope. Since we now require cmake_language(DEFER CALL), users who generate VS projects with CMake versions older than 3.19 will see a warning that the update_translations target cannot be created. The VS installation comes with a recent enough CMake version (on my machine it's 3.26.4), so this should not be a problem. [ChangeLog][CMake] When using CMake's Visual Studio project generator, the creation of the update_translations target requires now CMake 3.19 or newer. A warning is printed for older CMake versions. This warning can be disabled by setting QT_NO_GLOBAL_LUPDATE_TARGET_CREATION_WARNING to ON. Fixes: QTBUG-119555 Task-number: QTBUG-115166 Change-Id: I16b6ebd467544caf852b8791f4db8699f8d4c483 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 66aebd35ab37cbe93ad728412116177b4e182b80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit aef0c3cf32885699fa2c6985136814db17d90ec6)
* Update dependencies on '6.6' in qt/qttoolsQt Submodule Update Bot2023-12-081-3/+3
| | | | | Change-Id: I2bc0caa01bdff569b2222222eea9d64ed9d74d92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add a section about QDoc macros to QDoc ManualLeena Miettinen2023-12-054-4/+483
| | | | | | | | | | | Describe global macros in /qtbase/doc/global/macros.qdocconf and /qtbase/doc/global/htmltabs.qdocconf. Change-Id: Iac48124a43d8adc413b24c2eaea6fe31fbd0c09f Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit f65c4d534056cc0e6770f084aff3da29d4dea6a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 08:33:08 +0000