summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-2314-23/+54
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2813471aad9bc8b9bd04efe8571be6d1bee3045c
| * qdoc: Fix assert on empty link targetTopi Reinio2022-03-153-2/+13
| | | | | | | | | | | | | | Fixes: QTBUG-97562 Change-Id: I9e2b2b3979f9c0ca22f23a1a5fef5296b2a34a00 Done-with: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * macdeployqt: don’t err on unexpected otool outputTor Arne Vestbø2022-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binaries with multiple slices (e.g. arm64, x86_64) will have an extra line for the slice, like: “/path/to/QtGui.framework/QtGui (architecture arm64)” The parsing code will skip this line since it does not match the regexp. In other words the parsing works by looking for lines which matches, and finding lines which don’t match is not an error condition. Task-number: QTBUG-98466 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry-picked from commit 4184a127fa08c3ffafad863f6dde5d4bdc349bf1) Change-Id: Ifc2a37f867b724b9773c578fc2ad018959842482 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Don't run qdoc tests if qdoc was not enabled during configureTor Arne Vestbø2022-02-251-0/+4
| | | | | | | | | | Change-Id: I2dd4998811769cc8df3b190cc411390e5a2557d6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| * CMake: Fix qt_create_translation to not remove .ts files on "clean"Joerg Bornemann2022-02-171-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running "make clean", .ts files were deleted. This must not happen, because .ts files are source files. Remove the .ts file from the OUTPUT of the custom command that updates the .ts file. Add a timestamp file instead that is touched upon updating the .ts file. In qt_add_translation we must depend on this timestamp file. If users call qt_add_translation, we don't depend on a timestamp file but directly on the .ts file like before. Fixes: QTBUG-96549 Change-Id: If93a6d1b47a33b29dc92fb987da2afcf8d29e895 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 153db2fedc5935d858d3adeb283ced5e4de5babf)
| * lupdate: Support numeric literal separatorsJoerg Bornemann2022-01-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Numeric literals that use apostrophes were introduced in C++14 so this adds support for cases like: int d = 10'000'00; int x = 0xAF'FE; This patch allows just any number and combination of apostrophes in numeric literals and doesn't attempt to detect ill-formed literals. We assume, lupdate runs on code that has been accepted by a C++ compiler. Task-number: QTBUG-53326 Change-Id: I23bd9b4c676694dc69199e4a17a612a011449e61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit c2d1163004078b98abc86318f45a6796aef18811) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * designer: Fix MSVC warning about returning address of local variable or ↵Kai Köhne2022-01-051-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary std::reverse_iterator::operator*() returns by reference while QKeyValueIterator::operator*() returns by value, so MSVC is correct when it warns about returning the address of a local variable or temporary in (*itStop).second: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.30.30705\include\xutility(1582) : error C2220: the following warning is treated as an error C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.30.30705\include\xutility(1582) : warning C4172: returning address of local variable or temporary Avoid this by just iterating backwards. Amends 6ed8a22dd2756557954dc85052870c0894de06ba. Change-Id: I01ce7cb151efa61e8702686b3a463790869df72c Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit a9084297f629423c64d571d7f7286d3c0e239247) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump copyright year to 2022Kai Köhne2022-01-054-4/+4
| | | | | | | | | | | | | | Change-Id: I1b3f0d1b84f507e45728a00fa652d0db936cebca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit bd8827cd95552372a5aca78a21210a46bddadc36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-108-26/+36
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I49622bd49ad2570121543819ad4d8d1e249dcbcd
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
| * qdoc: Add styling for \note, \important and \warningTopi Reinio2021-11-086-24/+34
| | | | | | | | | | | | | | | | | | | | And add Atom types for Warning instead of simply hard-coding a bold warning note. Fixes: QTBUG-97448 Change-Id: I1fe691ffaadc549b17c8628817fe761d3be0fad7 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8687e163757df00c1e64c15ad63680ed5c2f6937)
| * macdeployqt: don’t stop qmlimportscanner after 30sMorten Johan Sørvig2021-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Process::waitForFinished() has a default timeout of 30 seconds, but qmlimportscanner can in some cases run for longer than that. Fixes: QTBUG-97104 Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 2e1cca4bb6051067c031c4b9b248b99acd63369a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-1217-30/+83
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I926253124b93a75804047a391069f943fdca3a0f
| * qdoc: Fix warnings about \generatelist argumentsKai Köhne2021-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | QString uses %1 as a replacement marker, not \1. Fixes: QTBUG-96837 Change-Id: Ib27fd6493eb81a0a4e11dbb1c01832282a78879c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a583d490d64e3e9fe96d6770115106988d87fa47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * qdoc: Fix Section::reduce() omitting sections with obsolete membersTopi Reinio2021-09-1311-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | This caused documentation for obsolete members to go missing if a section had only obsolete members. This commit backports 19002292a73d502da9ab4da168b8509cda1d6908 to 5.15/lts. Fixes: QTBUG-96369 Change-Id: I3104bba23cfc4ba831fd8405c851ef56347e4f3f Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * macdeployqt: detect debug libs by using “_debug” suffixMorten Johan Sørvig2021-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use endsWith() instead of contains(), which will not give a false positive for internal usages of the “_debug” string in the library name. Task-number: QTBUG-90982 Change-Id: I22258ab2cc59e36d13fcdc078fcb2ad6381de102 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ac79993e7f0f4cca37aac113ebddfedc470e7153) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I415ce13aa0d04479a54d73cadb983bc983cf023d
| * Fix extensions without leading period having first character droppedCraig Scott2021-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The list(TRANSFORM ... REPLACE) regular expression was malformed. CMake string parsing requires backslashes to be escaped if they need to be preserved instead of treating them as escaping the character that follows them. Fixes: QTBUG-96220 Change-Id: I61d46cfb7ed32fd97c49e15a1f58a055f12e596f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 581fc31c54aaa06af16c2047808a29be1a8d3239)
| * Doc: Remove mention of custom filters, part 2Kai Köhne2021-08-252-22/+0
| | | | | | | | | | | | | | | | | | | | Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-168-58/+50
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I47940f0d599b23a8d3e1fc1a0735540170c0d0c3
| * windeployqt: Account for debug version of ICU library when deployingAndy Shaw2021-08-061-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | If windeployqt is deploying the debug version of the libraries and the used ICU package contains debug versions of ICU libraries then the debug version of icudt should be included as well. Fixes: QTBUG-87677 Change-Id: I43266f9d65feacfd22c26de1008976bda001b481 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 8c6f62b9c26f6fb42fff185e702d365ab18bd1c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Doc: Fix a typo in the "Introduction to QDoc" documentation pageLuca Di Sera2021-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Changes `thinks` to `links` in the 4th paragraph of the "Why Standard Mode Is Slow" section. Fixes: QTBUG-95561 Change-Id: If49f2d58341f33adf8cb8504193d7e3cb3896fcc Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 07164bb6a5bdea6cacd69692287bd65a592b2f5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Doc: Remove mention of custom filtersPaul Wicking2021-06-241-40/+6
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-91082 Change-Id: I5610667072b618d8d0597e618f872266e4397536 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 235bbe3f939ce4b44b844ec67389c8a71ceceea5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Examples: Don't use QDir::separator() in internal pathsKai Köhne2021-06-213-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Documentation says: You do not need to use this function to build file paths. If you always use "/", Qt will translate your paths to conform to the underlying operating system. Change-Id: Iba62a197821b9abc819c3d333e44c9f1ed989898 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 8329ec476b3dc9bb7ffd17ee724b6b21c17e90ec)
| * Assistant: Make QResultWidget linkColor stylableFriedemann Kleint2021-06-141-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a property "linkColor" of QColor type to the QResultWidget class. Now it's possible to style the link color in search result widget through the following stylesheet: QResultWidget { qproperty-linkColor: red; } Fixes: QTBUG-74353 Change-Id: Ife57b5a64154be83f6eab4ef533840c51aefd1f5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-1916-36/+162
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic4320871845328c7fdb0168bb27e981ea31dcb27
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I05b5fee461c2e4f98d4716f047c8b1dc21e99b3a
| * Fix regression in lconvert handling empty translationsKai Köhne2021-05-143-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced by commit b96fe95da00aca6b, which enabled a sanity check that now failed to account for empty string. The serialized format of a QString is such that '-1' indicates a null string, otherwise it's <length><QChar>+. Since QChar is 2 bytes, length should therefore always be an even number ... except for -1. While at it, also preserve the difference between an empty string and a null string. Fixes: QTBUG-91558 Pick-to: 6.1 Change-Id: Iffbc6ee2c94b8363d2c1d91440022a77dbef4772 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b9a9f7b502f0631144176be343779a698e54161e)
| * Qt Designer: Fix alignment when adding new QTableWidget columnsFriedemann Kleint2021-05-103-0/+17
| | | | | | | | | | | | | | | | | | | | | | Add a default for new items to the column editor. Amends 3ecd3398218f4bddebeb034b4914699132cd5288. Task-number: QTBUG-85513 Change-Id: Ib78a967db710f16c783610825544c31187351654 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit dde1806d113b953955986589c866885f9958adf5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Qt Designer: Fix alignment of horizontal QTableWidget headersFriedemann Kleint2021-05-109-30/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The horizontal QTableWidget headers are centered by default. This is a problem since QTableWidgetItem::textAlignment() returns 0 for the default value and the header items are presented as list widget items in the editor which have default alignment. Populate the header list in the item editor correctly. Add a default value to the property manager (in the form of an attribute) and add a reset function. Also pass a default for saving. Fixes: QTBUG-85513 Change-Id: I78b95515f829cfb280f19a674575c8bd91fbb948 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 3ecd3398218f4bddebeb034b4914699132cd5288)
| * Qt Designer: Fix saving of item view header visibility on page based containersFriedemann Kleint2021-05-052-1/+19
| | | | | | | | | | | | | | | | | | | | Use Qt::WA_WState_Hidden for header visibility when the item view is hidden. Fixes: QTBUG-49591 Change-Id: Ic00f5bb8a2a1fe3d77358dc20c441bf763bb9204 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 908660847ccd632fbb18f605d387ce806ab1be1e)
| * Qt Designer: Slow down wheel scrolling of the widget boxFriedemann Kleint2021-04-261-1/+10
| | | | | | | | | | | | | | | | | | | | | | Determine the single step of the vertical scroll bar by the item height. Pick-to: 6.1 5.15 Fixes: QTBUG-93099 Change-Id: Ib04200131a64abb7beecd28bfa73433d6c20e9bf Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 7b2ffbc9697bab43a68efd12a2c58e5f5781bf21)
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-075-7/+9
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I008ff195f7dbe0ed9573f6c80db6a3eba412b4c1
| * QDoc: Fix possible crash in WebXMLGeneratorJiDe Zhang2021-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | In the at WebXMLGenerator::startLink, the "atom" argument maybe is nullptr. Fixes: QTBUG-91754 Change-Id: Ie97607ab9a1afc9f0df632b0448aa3294679180c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f4861c9a5aba08b13ec77cc5a6c754a08311db02) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I44ea2e15bdd9c6d1d3f91b6a40ff285853299671
| * Fix check for malformed input when decoding translationsKai Köhne2021-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use patch 458d49861f5 in qtbase also for the matching functionality in qttools. Any integer modulo 1 can never be anything else but 0, so the statement could never be true. Found by static analyzer: https://www.viva64.com/en/amp/b/0801/ Change-Id: I92d13877e5e44bb7555be7fb89c1ee546b25fbba Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit b96fe95da00aca6be4a30f7d6216f41e6538ec28) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Fix redeclared variable nameKai Köhne2021-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Pointed out by static analysis: https://www.viva64.com/en/amp/b/0801/ Amends 33a846a4d36e , which in turn fixed a static analysis issue :) Change-Id: I0d846a4d9287949241d6be034d294597035176bc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3bb59ef19323062b785be4dca99e07836e601648) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * qdoc: Allow any type of page as qhp indexTitleTopi Reinio2021-02-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | As a corner case, some documentation projects may want to use something other than a \page as the index page. As a fallback, look for any node that generates a page and has a name matching with qhp.indexTitle. Change-Id: I07372e7e4e2ab030674788f59bf0cb3ec0fd2f5e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit f96236f027c9e71724d7d185de6af38dc3d1e9e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-22889-10571/+10571
|/ | | | | | | | | | | This reverts commit 57a6c4852376027df7808cda250339dd5b37000e. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I56aa875d75deeb6c50c10e72553612ae6420fea5 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* qdoc: Don't clear the warning count in single-exec modeTopi Reinio2021-02-031-1/+2
| | | | | | | | | | | | | | | As the warning count and limit determine the exit code, in single-exec mode we need to keep track of the number of warnings for all documentation sets that are part of the build. This assumes that each documentation set retrives the warning limit from a shared location in the config. Fixes: QTBUG-90867 Change-Id: I7588a2a945094a02543a2cbd51ec5e3865666b47 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 173ecc34a2e8cf33325703b381003799aaaa42cb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump copyright year to 2021Friedemann Kleint2021-02-034-4/+4
| | | | | | | | Fixes: QTBUG-89980 Change-Id: Ice588f78d392f1dfd1f96de8840a3c7e28e4edd1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 0a097b742dcffc04690e98ce2e574febad25014d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qdoc: Fix generation of TOC for basic QML/JS typesTopi Reinio2021-01-282-2/+4
| | | | | | | | Fixes: QTBUG-90691 Change-Id: I576849bb291926461f40622278619ffe096036cf Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit cf8eb842984c315e8f0843d88bd6f42b73032117) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2021-01-28889-10571/+10571
| | | | | | | | | | | | | | | Updated the header.COMM license header to files under tqtc-qttools. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4158 Change-Id: I463b2076d98776025ddea67d6f685f8a3b0709a2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* 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)
View Lorry Controller Status