summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7' in qt/qttoolsv6.7.0-beta3Qt Submodule Update Bot2024-02-091-3/+3
| | | | | Change-Id: I7674268f88113f04c204436b452eb3549b5eee92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Refactor some parts of the PixmapEditorFriedemann Kleint2024-02-093-18/+27
| | | | | | | | | | | | | - Use std::optional<> for IconThemeDialog::getTheme() - Trigger theme dialog as default independent of whether the current theme icon exists - Factor out message for value text Task-number: QTBUG-121823 Change-Id: Ifd431ae894cb801075a46e54c8f355729bcd0a5a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 592aa9c392dc5d7cfe0ba92296c6f2be3c3c85bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Don't change state when command doesn't applyPaul Wicking2024-02-081-2/+3
| | | | | | | | | | | Ensure that state isn't changed if the requirements for COMMAND_QTCMAKEPACKAGE are satisfied. Pick-to: 6.6 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>
* Qt Designer: Split out PixmapEditor from designerpropertymanager.cppFriedemann Kleint2024-02-074-319/+391
| | | | | | | | | | | | | Split out with some minimal refactorings. Extract a helper PixmapEditor::setDefaultPixmapIcon(QIcon) to save some unneeded QIcon/QPixmap conversions. Task-number: QTBUG-121823 Change-Id: I90a3ec5c62df7fb27e878970ead6ccbc32edbd89 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit eeeee8835cbb7c95eeaf3aede571ce538f635ef1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Refactor class PropertySheetIconValueFriedemann Kleint2024-02-072-20/+21
| | | | | | | | | | | | Use the default for copy/assignment. Add missing move constructor/move assignment and fix up the debug operator. Task-number: QTBUG-121823 Change-Id: Ic273a4da69eac155de8c018d8e67183cdf503fac Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit bf8cf6f054d696a82bb4728cb4bcd9259674aa95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-02-061-3/+3
| | | | | Change-Id: I76b5afbe2f9c1b5fddf92a54d6a631e5a11425ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Designer: Change the icon/pixmap caches to use QHashFriedemann Kleint2024-02-062-47/+43
| | | | | | | | | | | | Instead of making PropertySheetPixmap/IconValue 3-way comparable types, change the maps to hashes. Task-number: QTBUG-103757 Task-number: QTBUG-121823 Change-Id: I6b494da682ee4c065dcd86339dd4cb7c7591b829 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 9b130f43b39e8bd0412530ab5b531d21eedaa4a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-02-051-3/+3
| | | | | Change-Id: Ib255e20cd31fd2c443a4bb5e07379fdbe7788395 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Ensure help project QHP SHA1s work cross platformPaul Wicking2024-02-041-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.6 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>
* Qt Designer: Port const char * constants to latin1 literalsFriedemann Kleint2024-02-0341-646/+639
| | | | | | | | | | | Run a script with some manual refactorings. It saves a few lengthy QLatin1StringView(). Task-number: QTBUG-121823 Change-Id: I2c9ee5436fdcfbd249ce8d908c993d57f07a4fac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 94a41d036d53b28e8638d13eae40875869af6123) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* designer: fix unity buildsTim Blechmann2024-02-011-0/+1
| | | | | | | | | `explicit specialization` due to Q_DECLARE_METATYPE(QWidget*) Change-Id: I856bef81dc7538315b5ad0ca44e5c396f92758b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 2379f3507d439ada089bb889f34f57afaa01f66f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/Windows: Fix hardly readable widget names in the property editorFriedemann Kleint2024-02-011-1/+15
| | | | | | | | | | | | The widget names are using BrightText, which has become blue. Hardcode white in this case. Task-number: QTBUG-97668 Change-Id: I391c52fcdb9e88092b05a5bb009e9d935023882f Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 2bd5bc8f87b4e6d2a9a4ff5e240a69d759758ea3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-02-011-3/+3
| | | | | Change-Id: I61b5ffa74356bc249de36fc81675556ff19d3be8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDoc: Fix typo in SPDX license in test dataPaul Wicking2024-01-312-2/+4
| | | | | | | | | | For some reason, there was no newline before the pragma once directive. Fixes: QTBUG-121563 Change-Id: I6346e79a470fe85e3f8488d5453b9066ae5302e4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 97e2d00e817e7382906176c793185c2995972d92) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Un-TP qt_add_translationsJoerg Bornemann2024-01-302-4/+0
| | | | | | | | | | | We're now confident that the API is good for now and is extendable in the future. Fixes: QTBUG-108108 Change-Id: I0992bc5c8d1d0c84a6c9d59bed4e8df5401f61ee Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ec7d11857ae1617b393bf4ebcdf91f888bdcf06c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Make Node::hasDoc() aware of shared comment nodesTopi Reinio2024-01-309-25/+26
| | | | | | | | | | | | | | | | | | | | | | Node::hasDoc() is used for checking whether a node is documented or not, in multiple call sites. However, this function returned false for nodes that were sharing a Doc instance with other nodes. One consequence was that when writing an .index file, QDoc did not mark nodes sharing a doc as 'documented'. This, then, excluded such nodes from automatically generated lists via the \sincelist command. Make hasDoc() return true for also nodes sharing a Doc instance. Eliminate Node::hasSharedDoc() as redundant; Node::isSharingComment(), together with hasDoc(), can serve the same purpose. Fixes: QTBUG-121186 Change-Id: Ib2d384901e6156492a33196f7b64ecced3fefd93 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 37c987269a38c9c683d41d74d02d3a0fc0707edd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Simplify unnecessarily complex conditional in DocBookGeneratorTopi Reinio2024-01-302-2/+2
| | | | | | | | | | | | | | | In DocBookGenerator::generateCollectionNode(), testing for Node::isFunction() or Node::isExample() always returns false as we're generating a CollectionNode which can only represent a group or a module page. Replace those tests with a simple check for a non-empty Doc::body(). Change-Id: I4fd2366242fd028e539875ede9808fd75d940ec8 Reviewed-by: Thibaut Cuvelier <cuvelier.thibaut@gmail.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 6933ae4df6f811367f431dfbb9b917487616a7b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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.6 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>
* CMake: Don't pass generated ui_foo.h headers to lupdateJoerg Bornemann2024-01-241-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | 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.6 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>
* Update dependencies on '6.7' in qt/qttoolsv6.7.0-beta2Qt Submodule Update Bot2024-01-231-3/+3
| | | | | Change-Id: Ia0674e84ae1c2ac26c7b719648964ee91b6147cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-211-3/+3
| | | | | Change-Id: I950d5a464df2f581ab90f7fd06315f5aebb2ee87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Linguist: Replace to-be-deprecated QCheckBox::stateChanged signalKai Köhne2024-01-201-1/+1
| | | | | | | | Fixes: QTBUG-121377 Change-Id: I89c91d97d35e2c5830cbe70b915415ef73e13b29 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 6c966524362c5a6b313e50384b201fa293a19daa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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.6 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>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-191-3/+3
| | | | | Change-Id: Iefb1eb3106a8505ec4cd4467fded77ccb250d8cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-181-3/+3
| | | | | Change-Id: I5afcfb6e9515bf4cee40967765c629d4109294dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* lupdate: Add support for template literal as translation source in qml filesLucie Gérard2024-01-173-6/+20
| | | | | | | | | Task-number: QTBUG-120531 Pick-to: 6.6 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>
* doc: add the \QMLLS product name to list of available macrosSami Shalayel2024-01-171-0/+3
| | | | | | | | | | Add an entry in the product name list for the \QMLLS macro. Task-number: QTBUG-120980 Change-Id: Ic7ff111338f56236052b09557adc8abe3833e103 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit a29ac848e39d49d915639e38be16ffa7af94a20c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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 Pick-to: 6.6 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>
* 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. Pick-to: 6.6 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>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-161-3/+3
| | | | | Change-Id: Id53274fdc3ca7467231fd6b4c91b781dbfe9d2a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-121-3/+3
| | | | | Change-Id: I190245ea71ecf67ecd0781d248e5c02f60471cd9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Display style in palette editor previewFriedemann Kleint2024-01-112-2/+5
| | | | | | | | Task-number: QTBUG-120633 Change-Id: Ia45046dd6bb2b8e0bb7fb8190a79b186a9a2107e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit cb675cd758fdab9c5553bb5a9bd69f5a9b305a91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Pick-to: 6.6 Change-Id: I51856cdedd6a3f2c2ec73d94c0f726c04caaabca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0c376fd83a8a9c0853d50753ee677fd40235d208)
* Qt Designer: Start where mouse cursor is in Top Level modeFriedemann Kleint2024-01-111-3/+15
| | | | | | | | Task-number: QTBUG-120236 Pick-to: 6.6 Change-Id: I0471794c0250484cfd15772d1c6bbeab201ef4e2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b27c8730175db14abb539dc949010ba90768a6de)
* qhelpgenerator: read file modification time in UTCJames Addison2024-01-091-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 Pick-to: 6.6 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>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-01-081-3/+3
| | | | | Change-Id: I70f84a1b276446c548db9bad4d0648e104b32f0a 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 Pick-to: 6.6 Change-Id: I1756df68de0960ea92bcaa0e51ea1a7980da727e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ffffeedf9ab1d537dab3b95969ee6b6681cb14ff)
* 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 Pick-to: 6.6 Change-Id: Id37ff342fa380b6789312124834180b5f01833ac Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 6aa71e6259dbf88d8d236f72020d265ddd48adfd)
* Qt Designer/QDesignerWorkbench: Fix a few clang-tidy warningsFriedemann Kleint2024-01-082-17/+18
| | | | | | | | | | | - Use auto * - Narrowing integer conversions Task-number: QTBUG-120236 Pick-to: 6.6 Change-Id: Ia9052fffda53d14ef83b1bdf874e55a3bbc89625 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b3e97845ae1bbf6912e6080ad68abb6586425208)
* CMake: FindWrapLibClang: Prevent global promotion of libzstd targetTopi Reinio2024-01-061-0/+5
| | | | | | | | | | | | | | | | | LLVM versions from 16 onward depend on libzstd and include their own script, Findzstd.cmake, to find it. It also creates a target that can interfere with logic in qtbase/FindWrapZSTD.cmake if it ends up being promoted as a global target. To avoid configuration issues, disable global promotion of the LLVM-created libzstd target. Fixes: QTBUG-120476 Change-Id: I9159f9a1184e00c6c924bd2251ad68857d17e16c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 504a48cb51a20c6fd7766266dc9f6c1c670f435a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Replace QDesignerWorkbench::marginHint() by a constantFriedemann Kleint2024-01-053-12/+2
| | | | | | | | | Task-number: QTBUG-120236 Pick-to: 6.6 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>
* Qt Designer: Change the settings keys to be latin1 string literalsFriedemann Kleint2024-01-051-20/+20
| | | | | | | | | Task-number: QTBUG-120236 Pick-to: 6.6 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>
* 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 Pick-to: 6.6 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>
* QDoc: Allow brace enclosed arguments in compareswithLuca Di Sera2023-12-296-6/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc allows documenting the ordering relationship between a type and one or more other types through the use of the "\compareswith"/"\endcompareswith" command pair. "\compareswith" takes one word to use as the comparison category, such as "strong", and then a space separated list of words that are used to specify the compared with types. Due to the list being space separated, it is impossible to correctly provide to the command a type that contains a space in its name. For example, "unsigned long" would be always be treated as the two types "unsigned" and "long". To avoid the issue, the command now interprets brace-enclosed elements as a single type, similar to how other commands in QDoc work. For example, "{unsigned long}" will now be treated as the single type "unsigned long". To allow for this, "processComparesWithCommand", which takes care of parsing the arguments passed to a "\compareswith" command, in "docparser.cpp", was modified to parse the arguments so that brace-enclosed arguments are treated accordingly ot the new specification. While QDoc already has certain procedures to parse a similar structure, such as `DocParser::getBracedArgument`, they are coupled to the state of the parser and are unusable in a more general situation. In particular, due to certain structural limits and the current implementation of the "\compareswith" command, especially its two phase parsing to handle continued lines, the available procedures are unusable without multiple structural changes. Hence, an inline parser that approximates the usual braced behavior, with some simplifications, was implemented directly in "processComparesWithCommand". After the command is processed and the a list of types is extracted, the list is stored back as a string that is later extracted and used during the generation of the output documentation set. Previously, the list of types was joined as a space separated string, later reconstructed during the generation by splitting on spaces. This makes it so the original collection of words in a braced argument that has spaces in it is lost in the translation. To avoid this, the current behavior is kept but the list is encoded as a semi-colon separated string and restored by splitting on semi-colons, so that meaningful spaces are preserved. The semi-colon character was chosen arbitrarily and has no particular meaning. The documentation for the "\compareswith" command was updated to reflect the new behavior. A simple specimen of brace-enclosed argument was added to "generatedoutput", QDoc's end-to-end regression testing suite, under the relevant tests for "\compareswith". The regression files for "generatedoutput" were regenerated to respect the changes in the regression sources. Fixes: QTBUG-120265 Change-Id: I6872d396ae05b831478d79e66bf426f9fb353b69 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit e66b37641bee97d0e52931ee73d1ba9ac609a7d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2023-12-221-3/+3
| | | | | Change-Id: I6b76a5a01cb8ba0f51be43a18067f9397525bd34 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clean up CMakeLists.txt file for qhelp exampleKai Köhne2023-12-211-7/+6
| | | | | | | Change-Id: I59a85f258216ba259e139a87b926d22a4a648df4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 501ee31a23e826f7e8525fb5a66aada97b7eeef8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_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.6 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>
* recolordocsicons: Add the tool and a READMELeena Miettinen2023-12-192-0/+108
| | | | | | | | | | Move the recolordocsicons.py script from qtcreator to qttools\util. Pick-to: 6.6 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>
* Doc: Improve \class command description in QDoc manualTopi Reinio2023-12-182-13/+12
| | | | | | | | | | | | | | | | | | Fix language issues in \class command documentation, and mention the requirement to use \inmodule, without which QDoc outputs a warning. Remove errant \target command. C/C++ structs/unions can be also documented using \class; mention them in the \class command description. Remove broken links to undocumented \struct and \union commands. Task-number: QTBUG-120136 Change-Id: I6e09cfce636ec048eb4dded4e58c6ef97dce6e07 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 4d2d1e6f670f09a90fd8dbb74a4c49b2daa35ec0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: port away from QPairFriedemann Kleint2023-12-1537-118/+123
| | | | | | | | | | Add fixme comment for public API. Task-number: QTBUG-115841 Change-Id: Id518638b7112b68d5cbbcbb2b66ec9dbb7e3108b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 36ae08faf04ec68f75f4f0ac9454cee2351f871e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 01:07:01 +0000