summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.0' in qt/qttoolsv6.5.06.5.0Qt Submodule Update Bot2023-03-281-1/+1
| | | | | Change-Id: I22b733d39d521acef1d21ad1c00ea7145fca095f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-251-3/+3
| | | | | Change-Id: Ia2a29278e7fb156772c8e273ca3d990350693c8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-251-3/+3
| | | | | Change-Id: Ib28cde19916af41f02397a6f2dd24d0801dbab2c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-221-3/+3
| | | | | Change-Id: I05022d1df07bde480dbcd45f16426ec061836788 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Copyright year to 2023Kai Köhne2023-03-214-4/+4
| | | | | | | Change-Id: I62921a04d2173dcd78797d792437a27bbaafc5c7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 8d505982e7431aed647680ca107ce1bf472825c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsv6.5.0-rc1Qt Submodule Update Bot2023-03-141-3/+3
| | | | | Change-Id: Ic8581464ebe6bd192d839507d76ea8bef9a25104 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-131-3/+3
| | | | | Change-Id: Ibf8a5f0f64df1a681d795d23d4fa0df19670023d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-111-3/+3
| | | | | Change-Id: If9f2849c597fa6808a16a1ce52d6a707fb8cf0a0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove reference to Multiple Inheritance ExampleAndreas Eliasson2023-03-101-3/+0
| | | | | | | | | This example was part of 6.4 but has been removed in dev. Change-Id: Ic5bbdf075ce0c45a894d5963a3790e7faf4cd5ba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 92201899218eedf2f0c868747ef19f51d762946a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-081-3/+3
| | | | | Change-Id: Iac8151464aa11a713b49f5ec51a20277fe6bd39e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qttoolsQt Submodule Update Bot2023-03-031-3/+3
| | | | | Change-Id: I701ac3aeb1627ba7b2aa94f3ec3f5ea28d30deca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Fix a crash with main windows with no central widgetsFriedemann Kleint2023-03-011-5/+4
| | | | | | | | | | | In the container extension for QMainWindow, check if the central widget is actually a managed widget. Fixes: QTBUG-111603 Change-Id: I50161a386084bc90d695461149486f3a7415e317 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 177c702534a6e43d4bde03433b24c397e2c12329) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable -fPIE for tools that depend on 3rdparty libsAlexey Edelev2023-03-012-0/+10
| | | | | | | | | | | | If the 3rdparty libs are not built with -fPIE enabled we cannot link it to the tools. Disable the flag until provisioning got the proper update. Change-Id: I25aa3dcec480219e3d29225ee517d9a910a1966e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 6deec055f952070caf19e537b223eb1dbeb509a1) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-03-011-3/+3
| | | | | Change-Id: Ibf9ec49751ccdd5e355688c35e41efc68bbf0811 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Report QLiteHtmlWidget in Assistant's About dialog if usedShawn Rutledge2023-02-281-2/+4
| | | | | | | | | | | | | | | It has been confusing for several releases that the About dialog kept saying it's using QTextBrowser. I can't find any evidence that there's even any code to instantiate a HelpViewerImpl right now. Amends 6e7ef34e6c8a2bd130fd5305e4b41fc8b11100a3 which removed the call "new HelpViewerImpl" in the HelpViewer ctor. Task-number: QTBUG-92267 Change-Id: Ieed2cf3237a07772152f179b9a82a2e35bfed0ee Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit a205c69ae2a69ffc1209e37ea05e2b9699241a44) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Update \brief description to be genericSafiyyah Moosa2023-02-282-16/+6
| | | | | | | | | | | Update the description of \brief QDoc command to be generic and apply to any topic command. Update link targets. Fix spaces. Fixes: QTBUG-111391 Change-Id: If41fd64ad420433aa022e7bb92506c06cfc0e76f Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 72bb62309f571411965a75be089af02d9bd21a79) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pervasive conversion of attribution scanner to Qt::StringLiteralsEdward Welbourne2023-02-284-112/+113
| | | | | | | | | Map QLatin1String("...") to "..."_L1, QStringLiteral("...") to u"..."_s. Change-Id: I2f6b2bf94bbcc982d90363a735d048f7eb5cb946 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit e1d21ec64e38892d870475e0aa3e8ea448f8fd7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Clean up code related to processing of \include'd linesTopi Reinio2023-02-281-20/+14
| | | | | | | | | | | | | | * Use qsizetype instead of int. * Remove unnecessary variable 'startLine'. * Replace a while loop with a for loop. * Replace nested conditional statements with (A && B). * Fix a corner case where a lone snippet tag at the last line of included file caused out-of-bounds access of the line buffer. Change-Id: I0b1009cf122681bcf700b67040a3d0ca19e82378 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f5a950df40295248b5da5aec261b2eb309033e25) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Remove worldtimeclock example imagesFriedemann Kleint2023-02-245-0/+0
| | | | | | | | | | | | | Amends 1f859ca1ac6d337aedde2fe8eed74266416ae0d1. As a drive-by, remove the outdated arthurplugin-demo.png. Task-number: QTBUG-110447 Change-Id: Iead32aaca944a886d86dd36465a2082309821be7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 989241b4149ed4233878102eb51505ad9e1707a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Improve Q_PROPERTY parsing for the property typeTopi Reinio2023-02-241-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | QDoc had a naive strategy for parsing Q_PROPERTY() macro arguments for resolving the type and name; when the argument string is separated by spaces, the first item was assumed to be the type, and the second item the name. This failed for following valid declarations: Q_PROPERTY(QMap<QString, QString> map ...) // type contains a space Q_PROPERTY(Type * handle ...) // '*' interpreted as the name Fix this by locating the first property attribute and then splitting the input at that boundary. This allows QDoc to extract the property type and name without making any assumptions about their syntax. Remove old workarounds as unnecessary and implement safeguards for invalid input. Also handle the MEMBER attribute correctly as it implies the property is writable, whether the WRITE accessor is set or not. Fixes: QTBUG-111093 Change-Id: Ic1bf071a7b003a1cd0cb9a212dabdb7ea00ebfbe Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 6e68db8c10001f58fcc1d93e2e7291ac3ac7d42d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Drop remnants of unimplemented feature \generate examplefilesTopi Reinio2023-02-245-45/+1
| | | | | | | | | | | | | | Previously QDoc provided a \generatelist example[files|images] <regexp> feature to list example files matching a specific regular expression, but it was left non-functional after changes to example documentation generation. Remove remnants of the related code paths and documentation. Change-Id: Ibdaab6e6be3e4d87b60fa59966783827f0a264e1 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit b29500cbbe3cd115009331bd412ad4d4e49b524b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Config: Streamline working directory handlingTopi Reinio2023-02-242-14/+14
| | | | | | | | | | | Let Config::[push|pop]WorkingDir() manage the working directory in addition to storing it, remove the unused return value from the latter, and add a Q_ASSERT to guard against popping an empty stack. Change-Id: I4983658f9d21eebaeb447b507694b0da1145e48c Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 347cdb15fd4d938c866a77ecf458bbee2723ac91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-02-231-3/+3
| | | | | Change-Id: I9492670ba60654e29b2e3a0a7d790ddf051bc55b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Make it explicit that XLIFF 2.0 is not supportedKai Köhne2023-02-231-3/+2
| | | | | | | Change-Id: I7b069537b39c657f56e648dc9ac5619fe56ee4f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b81049e887a4d02e528b84d3f8d5b03a1d5f3878) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc manual: improve description of argument handlingPaul Wicking2023-02-201-5/+6
| | | | | | | | | | | | Move the important block up, so that people notice in the first time they read the docs. Add a sentence to describe the point of enclosing arguments in curly braces. Fixes: QTBUG-109734 Change-Id: I245ff686a43c6fd443afdf98a28cd9564e492ed7 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit 47549facf70d8edcb9428980600076087a9a2cdb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix palette mask handling to consider single groupsFriedemann Kleint2023-02-205-44/+72
| | | | | | | | | | | | | | | | | | Whereas the palette resolve mask in Qt 5 had one bit for all 3 colors of a role, the mask is now a 64bit value with one bit for each combination of role/group. Introduce helper functions (copied from the QPalette source) to get the correct mask bits for each role/group and for all groups of a role. In the multiselection property helpers, check each role/group. In the palette editor, use row masks to clear rows. Task-number: QTBUG-110963 Change-Id: I089a75d03828ff894527601fc111d5e39183e695 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 0911566625acb43c3c18a129ae67612dd3e10da5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/QtUiTools examples: Add categoriesFriedemann Kleint2023-02-207-0/+14
| | | | | | | | | | Task-number: QTBUG-110447 Change-Id: If00868910d64168d4f5d7280945985490984762c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit e4f952fb82c202b6aec9c7717644eff23ce5bd47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer/QtUiTools examples: Drop 'Example' from titlesFriedemann Kleint2023-02-2011-19/+18
| | | | | | | | | Task-number: QTBUG-110447 Change-Id: Ia9c06560f15dfee58a8a441c3791785827b70913 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 5b3b7c4f85179d63aa901b66d26da3c2f88be3ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix oversights of the Qt Designer Multi examples code changesFriedemann Kleint2023-02-204-32/+30
| | | | | | | | | | | | | | | - Use new string literals - Reorder includes - Use some auto - Minor fixes Amends d1e672c47fd9cfa60f646554db6cba9de08a044f. Fixes: QTBUG-110447 Change-Id: I22c2ee4f2770e2656a6ffad0823ec59f7cf3df23 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 273202689fcddd5ae8af9596f46f03fc5fa6a6fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix exit crash on WindowsFriedemann Kleint2023-02-201-1/+3
| | | | | | | | | | | | Deleting the global menu bar deletes the window menu, which causes a crash when form windows are removed later on. Amends 78d807bc05590cd785e485fe1d2b07e86ca9bf79. Change-Id: I0789d77323d7c205163bbeb416452d31631c70d9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 73ac803c82ef37ff8dcb01d6f4d4d9b77543b20a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update qlitehtml moduleKai Köhne2023-02-171-0/+0
| | | | | | | | | | | | [ChangeLog][Third-Party Code] Litehtml (used in Qt Assistant) was updated to upstream version v0.6. Fixes: QTBUG-110353 Change-Id: Ib67936cd4493ff84d247fa241a1cc4ef641cf752 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit da526cfbfd97e662301965484241a6e9311d7fd9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qttoolsv6.5.0-beta3Qt Submodule Update Bot2023-02-171-3/+3
| | | | | Change-Id: Icf7df342119c19f610c4462bfb9c36fe40ef912e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update screenshots of the Qt Designer examplesFriedemann Kleint2023-02-1631-13/+13
| | | | | | | | | | | | Remove duplicated identical pictures and replace taskmenuextension-example-faded.png by a normal screenshot since it is hard to maintain. Task-number: QTBUG-110447 Change-Id: Iba7ee91dee8fb63af40c1c9b4163d573a1deae5f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 36d620918268f380316b0188f58a2fbcae9a518a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Disambiguate string constantsFriedemann Kleint2023-02-133-9/+11
| | | | | | | | | | | Complements 0f092219165ecd5751ef73cb939364134a0319ee. Task-number: QTBUG-109394 Change-Id: I098f2d42bbc367cee89284fb6fb2d2c7cfc5c54d Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 4d6f211f640a8278d287879ffb70a62303452ab7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Remove duplicated helper functionFriedemann Kleint2023-02-132-8/+2
| | | | | | | | | | | It causes clashes in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: Ia7aa2428f93f5ff07fea7e77e93df91cd0a75f4e Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit 00cc7b2e4a39eea81abf46b485a98c2cfc79630c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the broken test after the retirement of qt_parse_all_argumentsAmir Masoud Abdol2023-02-105-5/+5
| | | | | | | | | | | | As we are now processing the arguments with cmake_parse_arguments(PARSE_ARGV, we don't need to pass the escape characters anymore. Task-number: QTBUG-99238 Change-Id: I9c91e6d9678a87d7d5da1c36d72803f5e586513d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 4373a5e1a77ad571f7d7df9224c5aee8763f64d9) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on '6.5' in qt/qttoolsQt Submodule Update Bot2023-02-101-3/+3
| | | | | Change-Id: Ied7c7a2b4b50df85f1937d866737d5585ff626d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Move the uitools multipleinheritance example to calculatorform_miFriedemann Kleint2023-02-1015-27/+26
| | | | | | | | | | | | It illustrates how to use multipleinheritance from Ui struct and widget and is not really related to UiTools. Task-number: QTBUG-110447 Change-Id: If6b61c76ea0ac07b935f1e0a8ee02a2e7179cdc3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit db7a30bd1dca12b04f04a2617d54e22c61e5cf70) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-0960-291/+19
| | | | | | | Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1e0539ea51b75d9404ccc9506fcc0cdfa6951307) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Remove worldtimeclock examplesFriedemann Kleint2023-02-0820-860/+9
| | | | | | | | | | | The functionality is sufficiently demonstrated by the existing custom widget plugin examples. Task-number: QTBUG-110447 Change-Id: I09198bba46ebe8da03c9e21192588e6010bec541 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 1f859ca1ac6d337aedde2fe8eed74266416ae0d1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* lupdate: Fix build with clang 16+Björn Schäpers2023-02-082-2/+6
| | | | | | | | | | | | | The signature changed again. I've tested it with a current main, that is clang 17, but the commit 854c10f8d185286d941307e1033eb492e085c203 with introduced the change is also contained in clang 16. Change-Id: I050ca5843708be4489757538849000d3675005ac Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 87fac2de7378963e753a847da667d52d4ba95bff) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix palette mask handling for 64bitFriedemann Kleint2023-02-083-12/+13
| | | | | | | | Task-number: QTBUG-110963 Change-Id: I212f15dca35a93b02786567a2b8e1412eff48e90 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit dd1f00da0629816d6d4967636440111cc526f478) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Replace resolve mask checking by QPalette::isBrushSet()Friedemann Kleint2023-02-072-24/+17
| | | | | | | | | | | | | Whereas the palette resolve mask in Qt 5 had one bit for all 3 colors of a role, the mask is now a 64bit value with one bit for each combination of role/group. Port away from checking for the bits where this is easily possible. Task-number: QTBUG-110963 Change-Id: Ib6d3d44deb549bd3a49937eaef3385414480f8d3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 9576575335f367ee54df0a2aaa63f74348f8d8bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Port the subproperty handling to 64bit masksFriedemann Kleint2023-02-073-36/+46
| | | | | | | | | | | The QPalette resolve mask type has been changed to 64bit. Adapt the code accordingly. Task-number: QTBUG-110963 Change-Id: I9d1a2f20c7b671a0ef1a9182ccb2f8c964b231ab Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit a4551c99697430b173c96462beddc57fa2bd9a14) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Fix bitCount helper function to work with QPaletteFriedemann Kleint2023-02-072-2/+2
| | | | | | | | | | | The QPalette resolve mask type has been changed to 64bit. Make it a template so that it works correctly. Task-number: QTBUG-110963 Change-Id: I61394c58155bdc37a98dac0c763e6a7d9fbbfe84 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ce100433b239ac13b1711b5292481605ce8456e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix snippet indentation issues in QDoc manualTopi Reinio2023-02-072-1077/+1077
| | | | | | | | | | Previous changes left inconsistent indentation in example code snippets. Change-Id: I86e116455e22b513fbfdbacc65ac7e05b01b4c56 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit b1ab2e33a0dc87cf47d5adf7b156f8b2bde3d282) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: QDoc Manual: correctly output /*! and */ comment delimitersTopi Reinio2023-02-074-416/+405
| | | | | | | | | | | | | | | | | | | | | | | | The QDoc manual has a lot of code snippets demonstrating the use of commands, and these comments include the C-style comment delimiters, /*! and */. However, because */ is forbidden to appear within a comment block (as it terminates it), the snippets included malformed versions of the delimiters. This made copy-pasting annoying as the snippets didn't represent valid QDoc syntax. Fix the issue by using a '*' argument passed to code quoting commands, allowing /\1! and \1/ to expand to the actual delimiters in the output. Also, * Replace the use of \code with \badcode for QDoc snippets, avoiding the needless parsing/highlighting of non-C++ code. * Fix other minor issues in passing. Fixes: QTBUG-110142 Change-Id: Idcc4dc0fdfc6a8c7d368f3b2bc8f0dd8f1eb0843 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 8d74dd2b90b8a4dff743d6e083d35355ce1c4359) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Make QDoc's output less noisy by defaultTopi Reinio2023-02-0711-59/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | By default, QDoc printed progress information such as qt.qdoc: Start/Stop qdoc for <project> in <mode> qt.qdoc: Parse source files for <project> These do not provide much useful information, so hide them under the --log-progress command line option. --debug now also implies --log-progress. Remove all uses of leftover debug statements that used qDebug(), or where suitable, convert them to use logging category with qCDebug() and friends. Remove unused function FunctionNode::debug(). Clean up formatting and language for some of QDoc's output messages in passing. Fixes: QTBUG-110923 Change-Id: I2cab456b0e144249e4234a253fd1c90d76666132 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit b2864f175fe21d8d4bd7e67fbc4bac61a5087228) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude Qt Designer plugin examples from cross-buildsFriedemann Kleint2023-02-071-1/+1
| | | | | | | | | | | For some reason, they cannot be installed into sysroot, Complements 81fdb4dee5083a59dbdb2d01fcb6ab13285be26b. Fixes: QTBUG-110930 Change-Id: Ia6f4d123f7435a1388bb3cfef38daa48120b4891 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 64001fc4c692f317032989c5bdda97527777a171) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt Designer: Document CMake usageFriedemann Kleint2023-02-032-26/+67
| | | | | | | | | Task-number: QTBUG-110447 Change-Id: I8ec8a023d8efc76a7123c56eded528ea31294af0 Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ab37ec05836d9fd2d812c54b463f789c1484f399) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status