summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7.1' in qt/qttoolsv6.7.16.7.1Qt Submodule Update Bot2024-05-081-3/+3
| | | | | Change-Id: I3973843c48485318e787c7488c3efa1d00f07936 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.1' in qt/qttoolsQt Submodule Update Bot2024-05-041-3/+3
| | | | | Change-Id: I5f727054b107bb079978c20c572126b413cbdc80 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix path of embedded .qm files in sub-directoriesJoerg Bornemann2024-04-306-1/+68
| | | | | | | | | | | | | | | | | | | | Consider a project with sub-directories and a qt_add_translations call in a sub-directory. Before Qt 6.7.0, the path to the embedded .qm files was ":/i18n/foo_de.qm". With Qt 6.7.0, the path is ":/i18n/subdir/foo_de.qm". The reason is that we're called qt6_add_resources with the BASE argument "${CMAKE_CURRENT_BINARY_DIR}", and that is different if targets are automatically collected at the end of the project's directory scope. Fix this by passing the target's BINARY_DIR as BASE instead. Fixes: QTBUG-124188 Change-Id: I6afd39c072e7dccc2ff5937c5cd312a119b68587 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 9a6c9cc926f3b87f44f8e1db1272e1773af62cd4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a5b2239a8759d0f526412a1d14468f2cbbd53544)
* CMake: Don't disable qdoc if FEATURE_clangcpp is OFFJoerg Bornemann2024-04-292-3/+3
| | | | | | | | | | | | The fantastically named feature 'clangcpp' is for controlling whether lupdate is built with libclang. For qdoc, it's sufficient to depend on the 'clang' feature. Change-Id: Icde1dd1be216344b5276d10addd2ba24aa290142 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 9e9c598e2d36f4782059579ed2f3f23e9d65f276) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit e732929d9b5d109a28d1872105ccd86421b61fb8)
* CMake: Require libclang 16 for lupdate on MSVC version 1939Joerg Bornemann2024-04-291-2/+2
| | | | | | | | | | | | | | | | The headers of this MSVC version require at least libclang 16, and running clang-based lupdate will fail with such an error: error: static assertion failed: error STL1000: Unexpected compiler version, expected Clang 16.0.0 or newer. _EMIT_STL_ERROR(STL1000, "Unexpected compiler version, expected Clang 16.0.0 or newer."); Task-number: QTBUG-123611 Change-Id: I7006a72bd522b6ba7b6368fb5e99fe49b95c845c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 9746a55be9c00d6d968958cf7f7ff20e6f82b210) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 49e82ad18bad490e7a8dc5cfdb47d7817d9062bc)
* Update dependencies on '6.7.1' in qt/qttoolsQt Submodule Update Bot2024-04-281-3/+3
| | | | | Change-Id: Ia44dbf4843353d3d399cd9c23f3dbc3cbc5b026a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.1' in qt/qttoolsQt Submodule Update Bot2024-04-251-3/+3
| | | | | Change-Id: I97d30dd9db961437554a29bcde3258847507fad6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-04-171-3/+3
| | | | | Change-Id: I340d68632e86fa9c1ff0dd5236dc9aa0de01bea7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Add icon theme enum sub property editorFriedemann Kleint2024-04-152-2/+116
| | | | | | | | | Task-number: QTBUG-121823 Change-Id: Ic5f13e05ea7f836bb99acdef106c973b0a70a170 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 27075dd89d092ffa91312402c5c701888720ed12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Add icon theme enums to the main icon propertyFriedemann Kleint2024-04-154-10/+76
| | | | | | | | | | | Rename the old string-based editor to XDG an add a new editor for the enumerations. Task-number: QTBUG-121823 Change-Id: Ib619c76d1406a1173b9eff902356f020b507057e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit fc6b8ee64d732cc322cad6f703f3b449d923e48c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Add icon theme enums to the action editorFriedemann Kleint2024-04-152-16/+53
| | | | | | | | | | | Rename the old string-based editor to XDG an add a new editor for the enumerations. Task-number: QTBUG-121823 Change-Id: Iac32aaa75b558f564bb0add4a4747b5ac656eb6f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit d0e2a4d3e12b2a75e085a0c8b498a31b4b312715) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Add IconThemeEnumEditor and dialogFriedemann Kleint2024-04-154-29/+160
| | | | | | | | Task-number: QTBUG-121823 Change-Id: I4c838b469f925ab924d94520cb786114c86e3182 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c1276e62ff75e71e87c281c9a93c8491ab306b58) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-04-151-3/+3
| | | | | Change-Id: I0054b19f9b7decd47394f306eacb37603c530014 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Assistant: Update qlitehtml submoduleEike Ziller2024-04-101-0/+0
| | | | | | | | | | Fixes jumping to QML properties Task-number: QTCREATORBUG-30625 Change-Id: Iad9fa3d8f595726328db5b11ae6d2b29ae960e01 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 1f123f7dd813d1a55527c56761d5d4cd29fc3107) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-04-091-3/+3
| | | | | Change-Id: I0131bbf434446445b4ccdb0c521f42269058c1d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change license for tools filesLucie Gérard2024-04-0911-11/+11
| | | | | | | | | | | | | | According to QUIP-18 [1], all tools 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.0 Task-number: QTBUG-121787 Change-Id: I7b69118185d4237ec096dc76e78ee84c2ccd5eb2 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 67d10ced1f702de3a582da47fa657a724aa6a2bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct license in Qt Widget Designer pluginsLucie Gérard2024-04-0921-21/+21
| | | | | | | | | | | | | | | | | | | According to QUIP-18 [1], all module and plugin files should be LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only or LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I92aad08f60670faeb4396d717bd3719382dd41a7 Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1a095bff4abb6ab865db7abba70f93cb7167f889) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct license for documentation filesLucie Gérard2024-04-084-4/+4
| | | | | | | | | | | | According to QUIP-18 [1], all documentation files should be LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Ifedcaf2716ca6bf5b69d373a7ddf7ec5085384b3 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 7e214df7e30ac2aa8e0c00f13bc9e2b67eeb1fc6)
* Correct license for examples filesLucie Gérard2024-04-052-2/+2
| | | | | | | | | | | | | According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I1b15be4279c9c85b8d6275aa0cd663a8b9f8dca1 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 12bfbe304329ef5c908958a5cf44969f91719771) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-04-041-3/+3
| | | | | Change-Id: I9a1a2468d239acb9fdac74462a8a7c596fe71539 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-04-031-3/+3
| | | | | Change-Id: Idf80f74c0bd53fc9a92eccaca8bc8c8f4a779116 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-281-3/+3
| | | | | Change-Id: Id8e4c3ade439421d82f06000346b8eff13a6677d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-271-3/+3
| | | | | Change-Id: I16b9a92b3be62d4c35f84e6ac54ae5794108ca58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* lupdate: Fix 2 warnings about deprecated Clang API in Clang 18.1Friedemann Kleint2024-03-262-2/+2
| | | | | | | | | | | Fix: llvm: :StringRef clang::FileEntry::getName() const is deprecated: Use FileEntryRef::getName() instead. [-Wdeprecated-declarations] Change-Id: I1999899c4aa93db36860725d6a37221b868cde0d Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> (cherry picked from commit afd5e25730d1a7d0c22ac0c83331a47bf010afcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-211-3/+3
| | | | | Change-Id: I8f92f30f9256653c2d53cf03b1d78bbf0430ef9d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix discrepancy in qt_add_translations .qm output pathsJoerg Bornemann2024-03-211-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | When calling qt_add_translations with automatic target collection we 1. Predict .qm file paths to be in CMAKE_CURRENT_BINARY_DIR and return the paths in QM_FILES_OUTPUT_VARIABLE. 2. Defer the call of qt_add_translations to the end of the PROJECT_DIR scope. 3. When running the deferred call, generate .qm files in CMAKE_CURRENT_BINARY_DIR. The values of CMAKE_CURRENT_BINARY_DIR in steps 1 and 3 are different if the call to qt_add_translations is in a subdirectory. Fix this by passing the .qm output directory to the deferred call of qt_add_translations and qt_add_lrelease. Pick-to: 6.7.0 Fixes: QTBUG-123405 Change-Id: If4a9cdc03ed4659f28ff70c7662f1125a1f59b55 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 5c3800b7ff94b36b2ca13fc23acfd9209ea4c50b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-201-3/+3
| | | | | Change-Id: Ic0ec0089b3b54606380573e25a5f5b63da12ef02 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix wrong qt_add_translations argumentJoerg Bornemann2024-03-201-1/+1
| | | | | | | | | | TS_BASE_NAME should be TS_FILE_BASE. Pick-to: 6.7.0 Change-Id: Icc9d268d016ea1baee6cdd8c7d36d9ea1d015cd4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit db5038b8a5a1c1904d8f7609dd583319184fc266) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix code preview not working in PySide6 on WindowsFriedemann Kleint2024-03-191-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. Pick-to: 6.6 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>
* Documentation: Update the list of file formats supported by lupdateFriedemann Kleint2024-03-191-2/+3
| | | | | | | | Pick-to: 6.6 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>
* Qt Designer: Prepare QToolBar handling for interaction with the form editorFriedemann Kleint2024-03-182-16/+30
| | | | | | | | | | Make event filter of QToolBar more fine grained. Task-number: QTBUG-120470 Change-Id: I4cb6cb0e91fb989abfa874419985adf696acf034 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit c27066962bba7247677c9e169a1afd55ead87e26) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Refactor handling of passive interactors in the editor toolFriedemann Kleint2024-03-182-12/+25
| | | | | | | | | | | Call WidgetFactory::isPassiveInteractor() only for the events that need it. Task-number: QTBUG-120470 Change-Id: If3818128a20df34d1d6b5cb6d26dcffba531ac58 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit cd737605fbdf99b398723ac9f535ca707f96dda8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Improve code previewFriedemann Kleint2024-03-181-1/+6
| | | | | | | | | | Set a fixed font and make it big enough to accommodate 100 characters. Pick-to: 6.6 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>
* Qt Designer: Save/restore theme icon valuesFriedemann Kleint2024-03-185-7/+151
| | | | | | | | | | | | Use the existing "theme" attribute to store the theme enum name (fully qualified to be able to distinguish it from an old XDG/file name theme). Task-number: QTBUG-121823 Change-Id: I7db33548b20caa86bef5103f9234a277fc21b5b1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ac3215b1bb5bfe11095bb4721fea3bf501192a97) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-171-3/+3
| | | | | Change-Id: Ic2102c6451f6bdd0f20dd601d046af0e709b958d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix 'file to open is a directory' on update_translationsJoerg Bornemann2024-03-151-0/+3
| | | | | | | | | | | | | | | | | To feed lupdate a list of source files we generate a .cmake file with a $<TARGET_PROPERTY:foo,SOURCES> expression. Apparently, this list of sources can contain empty entries, stemming from INTERFACE_SOURCES with generator expressions that evaluate to the empty string. Filter out those empty entries when generating lupdate's .json file from that .cmake file. Pick-to: 6.7.0 Fixes: QTBUG-123338 Change-Id: I1dc383d6c75da7af560a50071c390f18321be066 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit e8b61043a6c152f0f9593d9b798a7cd3e9c1f596) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change license for build file in exampleLucie Gérard2024-03-1517-17/+17
| | | | | | | | | | | | | According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Iace5eb946b0291ecdf54f7e42ba56e8912ea438b Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit c094f1fced2398657b80cfa2993a12194d862831) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct license for tools fileLucie Gérard2024-03-151-1/+1
| | | | | | | | | | | | | According to QUIP-18 [1], all tools file should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I699bab8ade0448b02251729ed5dd85c3a97e4000 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 62d3e42e8183f9e0d6873130237e9af296e83fcc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct tools licenseLucie Gérard2024-03-154-4/+4
| | | | | | | | | | | | | | According to QUIP-18 [1], all tools should be LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Ibae020258fe93d60bd45f5f2afeb98da7a90ea4a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 709ed2fd3d34751541dedaede389a99f223b8721) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct doc snippet licenseLucie Gérard2024-03-158-8/+8
| | | | | | | | | | | | | | | All file under doc/snippet should be license as Documentation snippets and according to QUIP-18 [1] thi is LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: Id7c15bf13beac6b84ae5b86e99fd0c93638fe7bf Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit c316c8fc2f66473f3268106d075f30a4e4f83b69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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.6 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>
* Bump version to 6.7.1Jani Heikkinen2024-03-151-1/+1
| | | | | Change-Id: Iefda5a5176b54d54a1a22d56ae6b66f88fa25fe9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qttoolsQt Submodule Update Bot2024-03-151-3/+3
| | | | | Change-Id: I0010d434f22de4be2348ba9a516287bf985d6b98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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 Pick-to: 6.6 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>
* QDoc: Adapt clang/AST/QualTypeNames.h to upstream changePaul Wicking2024-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | QDoc maintains a slightly modified version of the Clang header `QualTypeNames.h`. Due to an upstream change [0] that changes an enum into an enum class and renames a value that's used in the aforementioned header, QDoc fails to compile against Clang 18. This patch introduces a preprocessor conditional check for the major version of `libclang` and defines the old symbol name if Clang is of a version where the symbol has been renamed. [0] - https://github.com/llvm/llvm-project/commit/4ad2ada5216ee2bb3c334a3233a9ab51f2521b82 Fixes: QTBUG-123109 Change-Id: I0fa916a201d963c5f23d87d73105b23fe55719ea Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 8c5e3f46e2fa5056280220c3b0a74025098e2be3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix target-less call of qt_add_lupdateJoerg Bornemann2024-03-072-17/+27
| | | | | | | | | | | | | | | | | | | | | A call to qt_add_lupdate like the following would lead to an error when updating translations, because we generated an invalid JSON file and fed it to lupdate. qt_add_lupdate( TS_FILES du_de.ts SOURCES main.cpp one.cpp two.cpp ) Fix this by ensuring that we don't generate subprojects entries in the JSON file if there aren't any subprojects (== targets). Pick-to: 6.7.0 Fixes: QTBUG-123011 Change-Id: Ic6465654375a7bfb7d387a6951f8f30408cae452 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit c12750987f2ca474f0016d553e508164957ba659) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct license for test filesLucie Gérard2024-03-07155-155/+155
| | | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Pick-to: 6.7.0 Change-Id: I0dd044d5b7342342378cdd3ca04a838b2b77e523 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 91a67be574c1b3b2845f19c2c8a356345fc2136b) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Qt Designer: Disable theme icons for macOSFriedemann Kleint2024-03-061-1/+3
| | | | | | | | | | The mix of system icons and Designer's icons is perceived to look a bit off. Change-Id: I684b5f4411d750850b288c2bb6f35bee057a0728 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit e49cb9684f09571b0c81ba2298ebd665d31b9bd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: Update qlitehtml submoduleEike Ziller2024-03-061-0/+0
| | | | | | | | | | | | 9c7b5d07 Update master CSS from litehtml Fixes layout issues Task-number: QTCREATORBUG-30459 Change-Id: Ifbce7b970121fe903f03f26c85635866203f9941 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 2c4e8847de53c133452cce51afc204e02c9e0d1b) 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.6 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:21:06 +0000