summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Fix addendums for QML signals that contain '.' in the nameTopi Reinio2021-01-122-4/+6
| | | | | | | | | | | QML signals may belong to a group, and the automatic note generation for corresponding signal handler must take this into account. Fixes: QTBUG-85572 Change-Id: Ibfc793475618fb78a8ba0a0344537917ad6fb0bf Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8a20d5b62dec6d45e6d6d29fd894aa362c3301fb) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Ignore empty example meta tagsTopi Reinio2021-01-081-1/+1
| | | | | | | | | | Incorrectly formatted parameter for the \meta tag command may result in empty tags, and cause an assert later on. Change-Id: I504e038f119833615976ba44549934ccc70aea31 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c8500ae622f47dee84cb1ee2dbf167921de3e5c1) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Fix breadcrumb generation for normal page nodesTopi Reinio2021-01-051-2/+2
| | | | | | | | | | | | | If a \page uses a single \ingroup command and a matching \group exists, QDoc is supposed to add a link to that group in the navigation bar (breadcrumbs) for that \page. This was broken as a result of a changed inheritance structure of nodes. Fixes: QTBUG-89835 Change-Id: I915d7ae41866fa89fcd0b133b4827f2e3d55bd54 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 228be3bd697a70a31c26c26d6d21d7bd0aebceda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clamp registered collection time-stamp to SOURCE_DATE_EPOCH if setKai Pastor2020-12-021-1/+9
| | | | | | | | Task-number: QTBUG-62697 Change-Id: I73cc41db9c57d050783e963896f9696c294126c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b463cd691b533ee31d602b2226b90d3c528b6a94) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix handling of -extensions argumentKai Koehne2020-12-011-3/+3
| | | | | | | | | | | | | | | | | | Do not expand _lupdate_options for list commands; depending on the content, this might cause CMake to treat it's content as separate elements. Also avoid IN_LIST; it was only introduced in CMake 3.3, while Qt 5.15 still also supports CMake 3.1, 3.2. Anyhow, we can as well just directly list(FIND...). Amends 2834bebc9e6ba9bf0577db1d7da42a52e622adc6 Change-Id: Ib4c73956477803cc8ec2f4048ffbab8daf2136e5 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Craig Scott <craig.scott@qt.io> (cherry picked from commit 71ed18ed4b07c47e42f60c770bf7f5b4f8be4b20)
* Add changes file for Qt 5.12.10Antti Kokko2020-11-271-0/+26
| | | | | | | Change-Id: Ib792058f1915a7737bd893769ec17dc3fde983bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1d665e7f4ac2a426e702c2935f11aa160e27bddb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix qdbusviewer.exe missing version and copyright informationLi Xinwei2020-11-272-2/+1
| | | | | | | | The rc file of qdbusviewer.exe should be generated by the build system. Change-Id: I038d5a092d95089b5f7ff36e48c2657dea230772 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3385dea6e3b69c76fa3a1ec176eee3d84d20f7b8)
* qdoc: Avoid excess warnings for undocumented namespacesTopi Reinio2020-11-231-2/+6
| | | | | | | | | | There is no need to generate a warning for an undocumented namespace that is documented in another module. Fixes: QTBUG-88603 Change-Id: Ibcaecad32a165776cd32290c823948570e3556cf Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 9eb640775743efe477d7791f7440a313447b9f61)
* qdoc: Skip ignored entries in .qhpTopi Reinio2020-11-194-2/+72
| | | | | | | | | | Classes marked with \dontdocument do not generate a class reference page. Skip them when generating the Qt Help project file. Fixes: QTBUG-86101 Change-Id: Ica80b505f1f23de0dd0ae59272903e1d19eadf93 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 7615656ced26a132c6894c080563e74d503be3c7)
* qdoc: DocBook generator: Fix \headerfile generationTopi Reinio2020-11-192-5/+75
| | | | | | | | | | Header files were missing content when using the DocBook output format. Fixes: QTBUG-84224 Change-Id: I625ff2a4b14d69f6df0f706cfd4fdbef2cd7fd7f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3297d012680e083b25a4740229f9fe77c4fdbc17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace prefined application name by a generic nameRalf Habacker2020-11-191-52/+60
| | | | | | | | | | | If the path returned from a call to a method of the QStandardPaths class contains the application name 'qtpaths' it is replaced by '<APPNAME>' to output this generic name. Task-number: QTBUG-87058 Change-Id: I7a9e848f42bf94ef4bbd4757e77ccfeefa8dfa9f Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 8e642309ffd57637eed2841971f1d938662232b6)
* Doc: Document attribution argumentKai Koehne2020-11-171-6/+8
| | | | | | | | | | | Attribution pages got introduced in commit d3f3e98ee. Also order the arguments alphabetically. Change-Id: I14d54067b803bf6a788676a45fec7969486187be Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 3d97baa9535a7dc4dedd883d1c1fa2a2a0e6d1c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Handle JSON as plain textTopi Reinio2020-11-121-4/+4
| | | | | | | | | | | | | The JavaScript code marker failed to handle JSON snippets; drop the advertised support for it, parsing JSON as plain text. This is OK as there's typically no types to link to or highlighting needed for JSON data. Fixes: QTBUG-81596 Change-Id: I004fcbe97a66ff5a33c4c443a24d16107aacb4c8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d54cfd5ade5c18ed66a1defa337ca3f6aea2ab1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix usage of qt_create_translation in a CTestKai Koehne2020-11-111-1/+1
| | | | | | | | | | | | | | | | | | | Commit 1b006ab3d8954 declared an input file generated by CMake as a BYPRODUCT of the consuming file to fix a policy warning CMP0058. Anyhow, this is technically incorrect, since the file is actually not produced, but consumed by the lupdate command. The incorrect fix also had the side-effect that ninja clean did remove the file, which prevents the use of the macro in CTest. Just remove the BYPRODUCT declaration. The file is written by CMake, so it actually doesn't need neither to be listed in DEPENDENCIES nor in BYPRODUCT. Task-number: QTBUG-71354 Change-Id: I7e5677f2bbd84b8a9fffdcb73465dfae6012ceb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3101eae233f1f5031c5c814d70dedbc7986e7db8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clear out deprecated QLocale::Language valuesEdward Welbourne2020-11-041-6/+2
| | | | | | | | | | | | CLDR provides no Bihari locale data, so we're retiring it. Tagalog is now called Filipino. Various aliases mentioned in comments are going away. Task-number: QTBUG-88167 Change-Id: Ie31353911be2de908f53e9b84d6b819677ad946b Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7268647fd5f911303a507fd5cc7c3feb48bb253f) Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* qt5_create_translation: Fix handling of directory dependenciesKai Koehne2020-11-041-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | lupdate supports whole directories as sources. Anyhow, in this case we cannot just declare the directory as dependency; it will force lupdate to re-run every time and emit a warning: warning MSB8064: Custom build for item "..." succeeded, but specified dependency "<the directory specified as a source>" does not exist. This may cause incremental builds to work incorrectly. The patch checks if each specified source is a directory, and if so: * Generates globbing expressions for the list of extensions to be used. * Search the specified directory for matching files. * Add those files to the list of dependencies to give to CMake instead of the directory itself. The list of source file extensions is derived from lupdate defaults, but can be tweaked by a new '-extensions' argument. Original patch done by Chris Djali. Fixes: QTBUG-86192 Change-Id: Icc22be4f3ee096361ac319208261cdc8191d9adf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2834bebc9e6ba9bf0577db1d7da42a52e622adc6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-301-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 67dd99b072fb96359f077e766067c0f218a64eba qdoc: Fix incorrect loop when processing tagged \fn parameters - 13c294c3bd61810ea7040691894e2c38f6f096ae Add changes file for Qt 5.15.1 + 2d557b1c5c4d2da8d307519835a0b97287891a9c winrtrunner: Remove Windows Phone support + 61c794846f3db82a10e5505397adb1b19bd21076 Use operator| to compose key sequences + 2cea79cfbb237c1f4bdc10619a1ddbdc5c49b39b qtattributionsscanner: Linkify dejacode URN's for LicenseId + a8708a3ee64dbf46a83ef572620758c26e2fc0de Qt Designer: Fix build of the QPrinter-related code + 97f4de3866cbf389ebc318c5b7fa923b28ffbe53 QDoc: Upgrade building with Clang 10 + c73abc317a7970740aabfb5a11b0af3970a577e0 Fix static build of assistant + 3c9315592180e8ae0404bccd4a843bac977c589c Assistant: fix build with QT_NO_CLIPBOARD + 0aad0fa07bfc27c71df27ab433916166b87148b7 Assistant: Use new config system for cursor + 0833db3f366eb59f08d4497dc424dd46b08da7ae QtHelp: Fix documentsFor() when not using filter engine + 5cd1c07e5d88c3c8521c1af45d47b519d6e1faba Designer: Fix a crash on startup when built without clipboard + f3180b6eb650598ca937943d6cd66da13335d9de Revert "macdeployqt: Don't copy .prl files into the Resources folder" + 79aff793613f031b5757c3e1e6f176436c4a532f Bump version + fe43e6779ea1a6f64869fedc0a0880e89e01bfaa qdoc: DocBook generator: Remove code for encoding special characters + ffedf9cf7e6c52d8b59af47b21e7a29ee23720ec qdoc: DocBook generator: Correctly handle enum classes + 72b5a4dcae9e9be4a6d66884d3cc0bfb2d692477 qdoc: Fix broken links generated by \sincelist + 4aa4e4f727233d8b620b2d591311c90cb8bed39b Add macdeployqt autotest Change-Id: I336f58e71b941f821a2070a885013b5fbea33e68 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit cb05caa294addee97311a5620659efc49c534425) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Avoid duplicates in \sincelistTopi Reinio2020-10-271-0/+2
| | | | | | | | | | | Related non-members appear twice in the node tree; when processing children of an aggregate, skip nodes that do not report the aggregate as their parent. Task-number: QTBUG-87866 Change-Id: Id06dcfe9ab4ce4d0ef18b69506fa82c2df9e85b0 (cherry picked from commit ff92f335d5223af55542753f6ce5da382a1d2cd9) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qtpaths: Add missing location typesRalf Habacker2020-10-271-7/+13
| | | | | | | Task-number: QTBUG-87058 Change-Id: I58926eec16f51640f0a1cbc390167346b42290a8 (cherry picked from commit bc75dce3583962d46983aa22c971ce85b9bd4af5) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I2d37f96c6b9f32d7e32b13ad09bc7f7555f04b99
* Add macdeployqt autotestMorten Johan Sørvig2020-10-265-2/+342
| | | | | | | | | | | | Add testing framework and test that builds, deploys, and verifies deployment of simple and complex app bundles. Based on the windeployqt autotest. Change-Id: If02321daa77bde3a787372656a5816df78f4b13e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit e0c08b3bfd0d0a92a8d60991260ee377357fa94e)
* qdoc: Fix broken links generated by \sincelistTopi Reinio2020-10-231-5/+5
| | | | | | | | | | | | | | | | | The combination of single-exec mode and outputting to subdirectories (offline mode) made \sincelist generate href's to new classes and functions that are missing the target subdirectory. This happened because we did not pass the relative node to the function(s) that generate that list - proper link resolution requires a check if the page containing the \sincelist command comes from a different doc module, and the relative node is used for that. Fixes: QTBUG-87802 Change-Id: I30024d651a857b15375ef7e35dfaa21f0193ec46 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 15ebf3327191335c2c6eac4114ccb0553dc34f63)
* qdoc: DocBook generator: Correctly handle enum classesTopi Reinio2020-09-284-7/+270
| | | | | | | | | | | While commit 46f71fcc fixed handling of enum classes for the code parser and marker, the DocBook generator has some dedicated code that also needs to be amended. Fixes: QTBUG-84703 Change-Id: Idea969e4baeb5adc0071e842733104758a70b703 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a6ab3c81f038f7bc2d32c9c613ba195758d0b011)
* qdoc: DocBook generator: Remove code for encoding special charactersTopi Reinio2020-09-281-22/+1
| | | | | | | | | QXmlStreamWriter already handles this for us. Fixes: QTBUG-86988 Change-Id: I6aafbf880e79fc4e0a7600f272ae298929577da8 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 89fccddc379dd009327cb4118f786040685b1b63)
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I1ee444f1b1557994bac5759968676889110e39e9
* Revert "macdeployqt: Don't copy .prl files into the Resources folder"Morten Johan Sørvig2020-09-221-8/+2
| | | | | | | | | | | | | This was skipping other files from Resources/ as well, such as “en-GB.pak” and “QtWebEngineProcess”. This reverts commit aabba72f7965e06e2e6ed960d8cf8078249dac8c. Fixes: QTBUG-86759 Change-Id: I6d27e3a32b479e1b6765783af71dd16826b181ca Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 2727412238300d847493351e706f01d180c64d70) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Designer: Fix a crash on startup when built without clipboardJarek Kobus2020-09-164-4/+20
| | | | | | | Change-Id: I4559c14316d63325554466c710ef0d8017e5876f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit b5da5f522616f99b000ed1c64a5cc1de0c3f8937) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtHelp: Fix documentsFor() when not using filter engineJarek Kobus2020-09-163-11/+48
| | | | | | | | Fixes: QTBUG-84727 Change-Id: Id66cc071a24cc761dc63d044b7f74d0e1959cd22 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit dbe178044b591490cb98c071da8b91342129e030)
* Assistant: Use new config system for cursorJarek Kobus2020-09-151-4/+4
| | | | | | | Change-Id: I528a4d5f2bcefc42cdec08d6742936ccdbc4ae84 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit db8e1b5d926cce2eba2d558eca9535e43ba32957) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: fix build with QT_NO_CLIPBOARDJarek Kobus2020-09-159-19/+49
| | | | | | | | Fixes: QTBUG-86598 Change-Id: I02348fc3b3b8e842a2aaaac6f98078f86ba2a767 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 979f7fe10b2c2a921efa483afe887c7d17297fc7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix static build of assistantJarek Kobus2020-09-141-1/+1
| | | | | | | | Fixes: QTBUG-86477 Change-Id: Ifb77fb38b4b182a996666c6b69d8357458add0c4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 6db2b442dd14eb068bba52e4f7223139ea29a558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDoc: Upgrade building with Clang 10Cristian Adam2020-09-111-197/+88
| | | | | | | | | | | | | | | | | Clang 10 will allow the same way of building qdoc against a static or a dynamic build of clang. Qt will have prebuild packages of both, but not in one package, but instead of two. Due to Windows platform one cannot have both static and dynamic builds of clang. Change-Id: I9c6ecc9886263d797a5523063dafd223d8cb7585 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit d9dc6dddb49439900695a5000e6ad19c935a535e) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Qt Designer: Fix build of the QPrinter-related codeFriedemann Kleint2020-09-091-1/+3
| | | | | | | | | Adapt to qtbase/00a5629d8de18bc1a5dfb6e2526c03b4b021c903. Change-Id: I60d087effa61b09c7907d6168f8fa710462913c3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 87b3a255d3ede3d8aef7fc1ebdbb30b2bff2463f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qtattributionsscanner: Linkify dejacode URN's for LicenseIdKai Koehne2020-09-071-2/+6
| | | | | | | | | | | | | | | | | | So far we only allowed SPDX license ID's. Anyhow, there are some licenses not represented in SPDX, but in the much vaster DejaCode database. This is the case e.g. for the Bitstream Vera Font License, which is tracked in Qt Gui and currently leads to a 404: https://doc.qt.io/qt-5.15/qtgui-attribution-vera-font.html To avoid having to flag all such licenses as 'NONE', we now allow LicenseID to contain URN's of the form urn:dje:license:, see also https://enterprise.dejacode.com/urn/urn:dje:license/ Change-Id: Ibf42f00452dbf5d28318b3217a9fe74e33f7c97c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 43fc39462a72b0f098a6d1412c0b150b2d4942e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use operator| to compose key sequencesFriedemann Kleint2020-09-075-17/+18
| | | | | | | | | | | | In preparation for deprecating operator+. It's deprecated in C++20. Insert casts as necessary. Drive-by, prepare for deprecation of operator+ for building key sequences. Initial-patch-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Change-Id: Iaae4e35a56aa1c2365bc25af2582cf820de38d5e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit ae8239a53ea9c512d60f54903c741aab33a6b439) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* winrtrunner: Remove Windows Phone supportOliver Wolff2020-09-0210-1826/+2
| | | | | | | | | | | | Windows Phone has not been supported for a while now. With newer Windows versions the functionality causes issues. On build 1909 the application hangs in CoUninitialize when called with --list-devices and in build 2004 the needed classes are not registered at all. Fixes: QTBUG-86293 Change-Id: I74a4cb03c246414df587ef1fc1187577e3c40775 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-311-0/+47
| | | | | | | Change-Id: I25043b2742a82bd9318b7977360a88776ce6534c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 72744ac361a94bfd80af16403a69f8ff2422d583) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix incorrect loop when processing tagged \fn parametersTopi Reinio2020-08-241-1/+1
| | | | | | | | | | | This fixes ASSERT: "uint(i) < uint(size())" in file qt5/qtbase/src/corelib/text/qstring.h, line 1067 Fixes: QTBUG-86188 Change-Id: I77e76d45b04561ad1ca63bc526fd7473e8c761f9 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c3ca1f972e402281d3ec42498d3051767449a41b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Add an option taking a list of languagesFriedemann Kleint2020-08-181-3/+12
| | | | | | | | | Fixes: QTBUG-85841 Change-Id: I8b731ded7b707f510ba41385998b78b191ba9f4c Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 5cc0dabf472ae6ef962473930ab40f11ed29ebf1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility files for 5.15 for QtToolsMilla Pohjanheimo2020-08-173-0/+62216
| | | | | | | | Binary compatibility files added. Change-Id: I6487cd4efbae9df1a5873b4f0c9ba4b511c0c1ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* qdoc: Fix regression in processing macro parametersTopi Reinio2020-08-121-0/+9
| | | | | | | | | | | | | A previous commit removed a crucial part of the code for resolving the type and name of a parameter. This commit partially reverts be0ba30d995ac7504d3ec69145ea425d1e68e7df. Fixes: QTBUG-86010 Change-Id: Ib34320e767e12bb42477cd406e51faf7bcfbf62c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 6ef42beb152dd74e74d8aaeaf644581fbd88dfb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Avoid changing html filenamesTopi Reinio2020-08-121-1/+1
| | | | | | | | | Output .html filenames should not change unless absolutely necessary. Change-Id: I17e2c95e18a7e23772d8b425c5255d0672fa6a57 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit db9dd6090c985d1d1ebfafdceb00cf2e252066ba) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix assert in the DocBook generator when writing property docsTopi Reinio2020-08-121-2/+8
| | | | | | | | | | QXmlStreamWriter::writeAttribute() must be preceded by writeStartElement. Change-Id: Ib73c44b16308b882d80544ec07cddf80339bb315 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit cb3d21e8085995e99ab60c66b361ed379054102a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace Qt::MidButton with Qt::MiddleButtonEdward Welbourne2020-08-108-25/+26
| | | | | | | | | The latter has been the preferred name since Qt 4.7.0. Change-Id: Ic6e1969788fb408929614474faac0bfc3fdfb602 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 8f269096b340b6ad384d00e841105b63b9e987a0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Correctly handle default values for \qmlmethod parametersTopi Reinio2020-08-077-17/+17
| | | | | | | | | | | | | The QML parser in QDoc was already able to parse default parameter values listed for \qmlmethod in a .qml file, but they were not handled when the command appeared in a .cpp or .qdoc file as a different code path is used for those. Fixes: QTBUG-85756 Change-Id: I671a19b66f82e1a6cd81b8bb487dffa2133ee65d Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 98cca5ff823fe2d4e41f45173e0675bcdf9e2542) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace qInstallMsgHandler() with qInstallMessageHandler()Edward Welbourne2020-08-051-2/+2
| | | | | | | | | The latter has been the one to use since Qt5 came in. Change-Id: I51fc5e20bbc9b3cf1e2e46c3895878a2022274ab Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 005f6f0bb3139a9d90daabab06bab2b346eb9de4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macdeployqt: Don't copy .prl files into the Resources folderAndy Shaw2020-08-031-2/+8
| | | | | | | | | | | Since the prl files are now in the Resources folder for a framework, then we should avoid copying these as they are not needed in the deployed framework. Change-Id: I0c728a647784b3d770bdd289c6deb8ff3d5ec9bd Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit 819983972f3e8d7062c94d073b83ee7821a188ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I726ab1b585594b901989508f76ab37a56c5cf8f6
* Doc: Remove obsolete warning from QDoc manualTopi Reinio2020-07-271-4/+0
| | | | | | | | | The documented argument types for the \list command all work. Change-Id: Id559a15a1b0e3ad77bf166be000289d01471e093 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit e619edc7034cb3276ccc4b3c93348042115d8fe8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: DocBook generator: Stop generating empty synopsis for shared nodesTopi Reinio2020-07-142-9/+3
| | | | | | | | | | Shared comment nodes must be skipped when generating DocBook synopsis to avoid incorrect output and documentation warnings. Fixes: QTBUG-82874 Change-Id: I8f9e4b0e921053dcd603a2f515eb59a6f42b4c84 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit dbc3ea8150aebe8b4964c533c2f6faecfc01f816)
View Lorry Controller Status