summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Port away from deprecated QVariant::TypeFriedemann Kleint2020-10-2830-428/+486
| | | | | Change-Id: Ie0f7364454047ca7c9715f8d48814d71334a3cde Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* qdoc: Fix a crash in the WebXML generatorFriedemann Kleint2020-10-281-1/+1
| | | | | | | | | | Fix a check for emptiness, amending d33ee8896ba141acae721744085a8b6d3ce7bd02. Task-number: QTBUG-79116 Change-Id: I8bb05a9ecbd07fb45b7a82eef2fa39561fb5bf06 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Fix issues in \include commandTopi Reinio2020-10-2810-20/+44
| | | | | | | | | | | | | | - 'sources' configuration variable was not considered when searching for file to include. - An empty QString was pushed to the location stack in DocParser::include(), resulting in vague warning messages - The search algorithm chose the first path that ended in the filename to find, with the potential of incorrectly choosing 'foobar.cpp' over 'bar.cpp'. Fixes: QTBUG-86844 Change-Id: If180ffe0817b2e786356b49f7e679e158fbc407d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Avoid excess warnings about undocumented namespacesTopi Reinio2020-10-281-15/+13
| | | | | | | | | | QDoc warns if there are documented entities under an undocumented namespaces; these warnings can be skipped when the namespace is loaded from an .index file, as it doesn't concern the module doc that's currently being built. Change-Id: I8c847c121debd961e9f5dd5a725081c18de9fb55 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* 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. Fixes: QTBUG-87866 Change-Id: Id06dcfe9ab4ce4d0ef18b69506fa82c2df9e85b0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Clear out deprecated QLocale::Language valuesEdward Welbourne2020-10-271-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. Change-Id: Ie31353911be2de908f53e9b84d6b819677ad946b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* qdoc: Fix handling of \fn signatures with unnamed parametersTopi Reinio2020-10-2719-70/+79
| | | | | | | | | | | | | | | | A misplaced 'i++' caused an error where names of documented parameters were shifted around if one or more of the parameters were unnamed. Fixing the above uncovered issues with handling of \fn commands with [tag] argument; improve and simplify related code. Finally, avoid redundant space characters when generating signatures with unnamed parameters or in 'All Members' page where parameter names are omitted. Fixes: QTBUG-87855 Change-Id: I526c89c10c66572b8c71106660f43346a4751e4e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Add deferred dependencies to doc toolsJoerg Bornemann2020-10-271-0/+6
| | | | | | | | | | | | qt_internal_add_docs defers dependencies to qdoc, qtattributionsscanner and qhelpgenerator. Call qt_internal_add_deferred_dependencies after those targets have been created. This makes it possible to build the doc tools automatically when building generate_docs_Foo targets without installing first. Change-Id: I4fa5082830303cfb22ed2b590e0e9036c3678cd4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-271-2/+2
| | | | | Change-Id: I02a31b8a6b0922b220020f06410d339e82cbabd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Regenerate examples to set the WIN32_EXECUTABLE propertyAlexandru Croitor2020-10-2620-0/+80
| | | | | | | | As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Change-Id: I26917656f6f2b653649765ebbea4e3f348b22ae7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add macdeployqt autotestMorten Johan Sørvig2020-10-237-2/+355
| | | | | | | | | | | | 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 Pick-to: 5.15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Don't make qtattributionsscanner depend on QtGuiVolker Hilsheimer2020-10-233-2/+4
| | | | | | | | It only uses QtCore classes. Change-Id: I2014d75f26f9b954c36b0e291064a2c2c7b3fb83 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix compiler warnings from deprecated QLibraryInfo::locationVolker Hilsheimer2020-10-235-5/+5
| | | | | Change-Id: I5ae779a77458ef92e1a8a134d1bf912e2d43185c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* 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. Pick-to: 5.15 Fixes: QTBUG-87802 Change-Id: I30024d651a857b15375ef7e35dfaa21f0193ec46 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix lupdate compilation with Clang 11Kai Koehne2020-10-223-15/+43
| | | | | | Fixes: QTBUG-87477 Change-Id: Ib78e890b18a6cd0469591a20a9675681da147748 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Add changes file for Qt 5.12.10Antti Kokko2020-10-221-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>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-221-2/+2
| | | | | Change-Id: I164c912730257ae1f6f60dcd1091189ffb227d38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Re-enable tst_windeployqtFriedemann Kleint2020-10-211-2/+0
| | | | | | | | After qttools/b346eba0a1b73b9798f4ad66cc81d0bfca712bd6, it should pass. Change-Id: I7a2c97d5018bc779bd3a375fa8ea3d401d6e132b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Remove usage of deprecated QStandardPaths::DataLocationKarsten Heimrich2020-10-213-7/+5
| | | | | | | Task-number: QTBUG-87037 Change-Id: I8bf93379a6c0243b823114628b7fa1422625fbb7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* CMake: Make optional packages not being found a bit quieterAlexandru Croitor2020-10-211-2/+3
| | | | | | Task-number: QTBUG-86053 Change-Id: I9afbea16b8b71f78a77ff77efd57397b438eba60 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qttoolsv6.0.0-beta2Qt Submodule Update Bot2020-10-211-2/+2
| | | | | Change-Id: Ic6bb1ade8fb62e712ceb3e681d76cc9cc84e7dba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Fix QList::removeAll() invocations to buildFriedemann Kleint2020-10-203-3/+3
| | | | | | | | After qtbase/3c74ba1f8b1052e684c67cbbb6f99eb4f7146f40, the type needs to be specified. Change-Id: Ic426e3088b14c9465d84acd760e35b9e87b0b231 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* qdoc: Add 'private signal' attribute for private signalsTopi Reinio2020-10-203-4/+6
| | | | | Change-Id: Ifa2682c8bc3864dfd11abbb475b064e74c105a52 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Fix parsing of private signalsTopi Reinio2020-10-207-4/+38
| | | | | | | | | | | Parameters with a type QPrivateSignal were already removed when constructing a FunctionNode from header declaration. This was erraneously subtracted from the number of stored parameters when parsing an \fn command. Fixes: QTBUG-87731 Change-Id: I01409c0fcdab0dfbf8a0b9d22cded99618bdcc2d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix warnings from missing optional modulesVolker Hilsheimer2020-10-201-1/+10
| | | | | | | | Don't try to add AxContainer and DBus on platforms where those are not relevant. Change-Id: Ibfa9845df59fbe2e5036207018bc1893f07e88d9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-201-2/+2
| | | | | Change-Id: I92d589aaf139fcfb72da53135767224dc8a13064 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Regenerate examples to use qt_add_executableAlexandru Croitor2020-10-2016-16/+16
| | | | | | Task-number: QTBUG-87661 Change-Id: I06af51591b79f9432d09b08595f8af021118a6dc Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-201-2/+2
| | | | | Change-Id: I2d3fd5f956b1def86e0c6205eaa05cc616253841 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-191-2/+2
| | | | | Change-Id: If0a3d454f46fabb1c18e93a47ee90aee56d91b52 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Allow documenting implicitly generated special member functionsTopi Reinio2020-10-1622-86/+292
| | | | | | | | | | | | | | | | | Implicitly generated class members such as default constructor are not visible in the Clang AST, and QDoc failed to match \fn commands for such functions. Fix this by visiting the translation unit generated for the \fn command, and constructing a temporary FunctionNode. If this temporary node is of any of the special member types that can be implicit, add that function as a child to the class node. Add 'default' attribute for such functions in the generated docs. Fixes: QTBUG-86984 Change-Id: I6c662e4ca030d80b68dd22f3639526093c27c20b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qttoolsv6.0.0-beta1Qt Submodule Update Bot2020-10-161-2/+2
| | | | | Change-Id: I430c89f76909f25fdbdeb38cc83ff41f6284e65f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-151-2/+2
| | | | | Change-Id: I8c27827b6cc31eade9bab006f4b7aae3b77ebb73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtpaths: Add missing location typesRalf Habacker2020-10-151-7/+13
| | | | | | | Task-number: QTBUG-87058 Change-Id: I58926eec16f51640f0a1cbc390167346b42290a8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-151-2/+2
| | | | | Change-Id: I7197500e510c902037b4f7905fa717185cb3a9ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Align group page heading sizes with other pagesTor Arne Vestbø2020-10-141-0/+1
| | | | | | | | The documentation for a group should have the same header sizes as other pages with similar level in the hierarchy. Change-Id: I17f0a3a02b14f6300c66d016450710309caf4e67 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qtdiag: show touchscreen availableVirtualGeometry; formatting fixesShawn Rutledge2020-10-141-2/+7
| | | | | | | | | | | | | | Example output from one device on eglfs after adding support for device-screen mapping in QT_QPA_EGLFS_KMS_CONFIG json: QInputDevice::DeviceType::TouchScreen "N-trig DuoSense", capabilities: Position Area NormalizedPosition availableVirtualGeometry: 1920x1080+2880+420 When the seat name is shown, it's now labeled. And a redundant space is removed. Change-Id: I90a8e558288f427008c28143c077fdda29a01541 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-131-2/+2
| | | | | Change-Id: I74d694cecf2bab6c318930d0204665f15cea0dba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-131-2/+2
| | | | | Change-Id: Ia5c380acf30f750c56f6700431dc0ab1e6cd350b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Store group membership for all node types into index filesTopi Reinio2020-10-129-27/+55
| | | | | | | | | | | | | | | | | | | | | Up until now, only select node types (PageNodes) stored the information about \ingroup command argument(s) into the index file. This meant that generating lists that contain non-page nodes (e.g. functions) did not produce correct results, if group members included non-page nodes from other modules. Add a helper function QDocDatabase::groupNamesForNode() that returns a list of groups regardless of node type, and use that when generating the index file. [ChangeLog][qdoc] QDoc's \generatelist and \annotatedlist commands now produce correct output when listing functions from external documentation modules. Fixes: QTBUG-87161 Change-Id: Id3079729891ec22716e4b7606bec604a7ebff74a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Fix processing of related non-members read from indexTopi Reinio2020-10-125-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | QDoc writes a node using \relates twice into the index; once under the original (lexical) parent (typically, the global scope), and again under the adoptive parent specified with \relates. This is by design, as it allows searching for the node under both scopes. However, when the nodes are read back in, what was originally a single node was duplicated. This caused issues e.g. when that node is part of a group; when generating a list for a group, a line representing the node appeared twice. Use Aggregate::adoptChild() when reading nodes from index, instead of constructing multiple nodes. This is similar to what the code parser does when processing the \relates command. To identify an index entry appearing twice as a representation of a single node, repurpose the "related" attribute to track the index of each related node. Fixes: QTBUG-87311 Change-Id: I2aa8a97b9be26ee3945b3e4ce222b0f8dc4ca8b5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-10-121-2/+2
| | | | | Change-Id: I1049ba84938865a55c14f9cb9a700c553aa1c83a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compile after QNativeInterface changes in QtGuiLars Knoll2020-10-121-1/+1
| | | | | Change-Id: If162f2ed52d39e8db755403c9c3f74793b7cc0bb Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update QStringConverter usageMårten Nordheim2020-10-123-7/+7
| | | | | | | Following fa8d021fa6fcb040fb702b6ffd2deee52a3b748a in qtbase Change-Id: I46495c1f0cde4e304e414b05cd66d14b00afd6b1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix compile after qtbase updatePaul Olav Tvete2020-10-111-2/+1
| | | | | | Fixes: QTBUG-87312 Change-Id: I970fd6ec986703cbe90199476fe13b555c87817b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qdoc: Stop removing content of the output directoryTopi Reinio2020-10-103-38/+8
| | | | | | | | | | | | | | QDoc deleted the contents of the directory specified by -outputdir in prepare phase - this was dangerous for users that do not expect that behavior. Instead of deleting, print out an error if the output directory is not empty. Fixes: QTBUG-87176 Change-Id: Iabefcc9733cf4c4b875fdd2bfd7f86f79d25349c Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qdoc: generatedOutput autotest: Don't regenerate files twiceTopi Reinio2020-10-091-1/+4
| | | | | | | | | | | One of the steps (crossModuleLinking), calls another step to generate its .index file. This caused also those files to be copied twice when -regenerate option was set. Disable the regeneration flag for the step. Change-Id: Ia3ed90c014a8ec89db18a7e7168a4bc167d4b82b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* lupdate/clang: Stabilize order of translator messagesJoerg Bornemann2020-10-092-9/+46
| | | | | | | | | | | | | | The multiple threads lupdate/clang runs lead to an unpredictable order of translation messages in the generated .ts files. This is particularly bad for autotests that compare the generated .ts file with expected output. We now collect the TranslatorMessage objects in a vector, and sort them according to the original order of input files. Then, we sequentially call Translator::extend with the messages. Change-Id: Ibc6df056477fe221c4cc50f6f6c394225d340dba Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* qdoc: Document friend functions as related non-membersTopi Reinio2020-10-0815-5/+139
| | | | | | | | | | | | | | | | | | When parsing a friend declaration in a class, QDoc associated the subsequent function declarations to the namespace scope. This was conceptually correct as friend functions are not class members, but made it impossible to match documentation to these functions using the \fn command; the functions are still found under the class scope in Clang AST, and this has to align with QDoc's node tree for the documentation to be matched correctly. Fix this by letting friend functions remain in the class, keeping track of the friend declarations, and marking friend functions automatically as related non-members. Fixes: QTBUG-86987 Change-Id: I0ad26eed1c72af9302c9e420f5db0ec98c40d86a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Don't generate include instructions for empty includesTor Arne Vestbø2020-10-081-2/+6
| | | | | Change-Id: Ia301afccca364e474d8c9070a3df323fddf20605 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Don't generate duplicate since-textTor Arne Vestbø2020-10-081-2/+6
| | | | | | | The requisites table already contains the since-info. Change-Id: Id8fb65e2c12b6177d35411844cfa98c4c8e943d5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
View Lorry Controller Status