summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qttoolsv6.1.0-beta1Qt Submodule Update Bot2021-02-231-2/+2
| | | | | Change-Id: Iac79e3ce8d9be19511900f82d6172205d15715da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-231-2/+2
| | | | | Change-Id: If94cc8f624114e5dff646ae072a8230adc86adb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Fix regression in handling of global functionsTopi Reinio2021-02-227-4/+154
| | | | | | | | | | | | | | | | | | | Commit 550c3031 improved the handling of \relates command, but introduced a regression; When relating a primary function (a first in the linked list of overloads) to another aggregate, the primary's nextOverload pointer was cleared. Subsequent \fn commands trying to document other overloads then failed. The correct way is to move the head of the linked list forward. However, if there are no overloads, we do not want to delete the list entirely, as the function (typically, a global one) must be searchable from the original (global) scope. Fixes: QTBUG-91244 Change-Id: If80fa93ac5231d0676c0809f1acfa97733f9f9e8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 026edd4bcefd6f0cffa72c2385407c28042b4b36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-221-2/+2
| | | | | Change-Id: Ia0802c7095a582be57ddbc8d790013234fcbc599 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* QFormBuilder: Save the 'name' attributeFriedemann Kleint2021-02-192-3/+2
| | | | | | | | | | Move the setting of the name attribute to the base class. Fixes: QTBUG-91088 Change-Id: I29955b5455015b4fc38b7f35d2247dac30d82d22 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit a8a01b6d2d7f5aab7b800bf054a6c323e1e78ab5) 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>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-191-1/+1
| | | | | Change-Id: I3dc86d3c3a41bc59704356c1fca3ed5782e157ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-191-2/+2
| | | | | Change-Id: I0602b6441b2878f8e098608be23dc7e6db6b5ea1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-181-2/+2
| | | | | Change-Id: Ib12302a993b10e148a97f107d7171b5550bc66a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-181-2/+2
| | | | | Change-Id: Ia2aebb06531eb74128fe1bae1fad45d2f2080e6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-131-2/+2
| | | | | Change-Id: I6aecd3e7bf2127e7e3ebad49551f0237133c8dcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-121-2/+2
| | | | | Change-Id: I03efa76de95f03ab44ba53e2706b08ea5d46aeb3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QMake project filesJoerg Bornemann2021-02-12120-3528/+0
| | | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Task-number: QTBUG-88742 Change-Id: I3f360105a8cd43ad37dec6bfc6509ce95c79ee76 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit aeaa9e2a46a3d8785c446d8a6347d6f82667cef8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsv6.1.0-alpha1Qt Submodule Update Bot2021-02-121-2/+2
| | | | | Change-Id: Icde4eef0b72f41e872a996d16a3728a222749e5f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-111-2/+2
| | | | | Change-Id: I6f261a55de45283adfc8cc340fff8c429010fb1e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove src/qtconcurrent/generaterunJoerg Bornemann2021-02-107-817/+0
| | | | | | | | | | This code generator is superfluous since QtConcurrent::run was rewritten. Change-Id: If28dcae3f6b6adbcc649fd403abe3b0275305cd9 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9cdcdaf0fb4fe1dfce62f391d1667acc63e251fa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-101-2/+2
| | | | | Change-Id: Ib9e48744a8b37cc75fe115ef6ddd316c0614667d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-101-2/+2
| | | | | Change-Id: If248c5a9ae6d5f29333a275bf4a0ee4b8e6647d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-091-2/+2
| | | | | Change-Id: Iba40ba3101deaec131328384f44e7b7ce4ae7f31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-091-2/+2
| | | | | Change-Id: I71ffd6969a40d137985ba014512459a879135aff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-081-2/+2
| | | | | Change-Id: I2960c711403dab0d815cd48e24103f16990ee155 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-061-2/+2
| | | | | Change-Id: If6a97cc2d20fd9cf589931315dfb97c6fa522191 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-061-2/+2
| | | | | Change-Id: I9e1a94e017cf524c62b05bb5466b6f43d192c58a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-051-2/+2
| | | | | Change-Id: I7a586acf640810e2f862e0f7a15b9419e1c6c32b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-051-2/+2
| | | | | Change-Id: I6885d2fdaa4844c01cb22bf4c2f11140b9cf6396 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-02-041-2/+2
| | | | | Change-Id: I556345bc5e14a0d70c31229d066af643f0b59cd9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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 CMake CONDITION expression "win32-icc_x_ OR win32-msvc_x_"Li Xinwei2021-02-021-1/+1
| | | | | | | | | "win32-icc_x_ OR win32-msvc_x_" never equals TRUE, even when using MSVC or ICC compiler in Windows. Pick-to: 6.0 Change-Id: I8b72635754da9fdc534013e3f95b98f380b315d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-02-021-2/+2
| | | | | Change-Id: Ic4f8629ceb2254b448af06f2e744075809810eb1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-02-011-2/+2
| | | | | Change-Id: I8abd0b8ea40dcee0f0e7b8e9192a0a221a794180 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-291-2/+2
| | | | | Change-Id: If94da4a81e956a06011ef9f212298288439df9d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Fix generation of TOC for basic QML/JS typesTopi Reinio2021-01-282-2/+4
| | | | | | | Pick-to: 6.0 5.15 Fixes: QTBUG-90691 Change-Id: I576849bb291926461f40622278619ffe096036cf Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-281-2/+2
| | | | | Change-Id: I0b5ef8c9e03c4679ab4ca87970489bfe42f9c9b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-271-2/+2
| | | | | Change-Id: Id435f8addd50327e5ce9ac9692ae2d9d547c5d76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-251-2/+2
| | | | | Change-Id: I34f2f039c5876bd7da99f879b34ba43c0c8b9529 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Qt Designer: Keep action editor selection in sync with menu editorFriedemann Kleint2021-01-255-5/+54
| | | | | | | | | | Add a function selectAction() to the Action editor and call it from the menu editor to keep the selection in sync. Block the calls to the object inspector while doing so. Fixes: QTBUG-89778 Change-Id: Id407de606158f20c75c8e65af49cbd80fae24d29 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix undo adding dock widgetsFriedemann Kleint2021-01-252-3/+14
| | | | | | | | | Use the previously unused AddDockWidget to insert the dock widget correctly in the QMainWindow container extension. Fixes: QTBUG-88584 Change-Id: Id93afca8637b9e5090f2655658e19537429d33d8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remember the dock area when undoing deleting dock widgetsFriedemann Kleint2021-01-251-1/+17
| | | | | | | | Store it as a dynamic property in the container extension. Task-number: QTBUG-88584 Change-Id: Icd16d65fb8410bda2fe6a084b3fceb9db5720f47 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-251-2/+2
| | | | | Change-Id: I9c6c9e35771595493bd0d1ea1d1f49206453fd47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-221-2/+2
| | | | | Change-Id: Ie0c9cadd3e4865b31155961233e33fcd95962fa8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Allow overriding documentation from abstract QML base typesTopi Reinio2021-01-2112-23/+198
| | | | | | | | | | | | | | | | | | QDoc replicates property/function documentation from abstract QML base types to the reference of the inheriting type. Attempting to override a member documentation for the inheriting type resulted in duplication: both the base and inheriting docs were rendered. As the decision on what's shown on the type reference is deferred to constructing the sections, implement this logic there. Modify FunctionNode::compare() so that we can compare methods from different parents, allowing us to override a specific overload of a method. Pick-to: 6.0 Fixes: QTBUG-89913 Change-Id: I3fb56c747e72b5a6ff387667e035a959e8f1c479 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Improve sorting of keywords in .qhpTopi Reinio2021-01-211-2/+2
| | | | | | | | | | | As a corner case, two keywords could have identical names and ids - for example, a 'foo' method and a 'foo' variable in the same class. Sorting these gave unpredictable results, making tests flaky. To fix, use Keyword::ref as a secondary sort key as it's unique. Change-Id: I5c7ddeaa86962a8368d927519a4bb70c43494a61 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-211-2/+2
| | | | | Change-Id: I82ee965e3e7a7070d07ff046e1bbeea57f3db9e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* lupdate: Fix warning about copy of loop variableFriedemann Kleint2021-01-191-1/+1
| | | | | | | | src/linguist/lupdate/cpp_clang.cpp:118:21: warning: loop variable 'source' of type 'const QString' creates a copy from type 'const QString' [-Wrange-loop-analysis] Pick-to: 6.0 Change-Id: If46d469da6653b9b59a2926080f0b37b74893b52 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-181-2/+2
| | | | | Change-Id: I0a944c9bc5c5a59388b59f8a98b30e48d41b4e8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-181-2/+2
| | | | | Change-Id: I3a263413a350c4a7cd4e393670e24977ba87605e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2021-01-181-2/+2
| | | | | Change-Id: Icaf6af17a3c04a7c77b2300c59eb18fca3db9650 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 01:26:19 +0000