summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Do not add class to map if isDontDocument() is trueMartin Smith2019-10-101-1/+1
| | | | | | | | | | | This update ensures that if a class node returns true for isDontDocument(), it is not included in the map used for generating the all classes list. This also applies to QML types. Task-number: QTBUG-78940 Change-Id: I020cb0dd2f16187d5f6c75b400778b1518d7e05a Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Remove multiple QTypeInfo entries from All Classes pageMartin Smith2019-10-101-1/+1
| | | | | | | | | | | | | | | QTypeInfo is a class that is generated by a Qt macro. It is not documented and is not supposed to be documented, but clang sees it as being in the public API. This update ensures that the class is marked internal prior to generating the index file. Ironically, this was one of the classes that motivated the addition of the \dontdocument command, and it was the test for isDontDocument() that caused this bug. We might have to visit the \dontdocument command again. Task-number: QTBUG-79088 Change-Id: I11307a2236e2ebcdcc205952056ddaca88fc0bd3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Add doc for the \dontdocument commandNico Vertriest2019-10-021-0/+18
| | | | | | Task-number: QTBUG-78936 Change-Id: Ia8635aa1b2d2ce97e5c1390bcdd7a5c920d87e83 Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: WebXML output: Fix output for \group and \annotatedlistTopi Reinio2019-09-262-6/+29
| | | | | | | | | | | | | | | | | | The WebXMLGenerator did not handle atoms of type AnnotatedList. Adding this enables listing of grouped pages with the \annotatedlist command. Similarly, empty output page was generated for the \group page itself. This was because QDocIndexFiles::generateIndexSections() only handled groups when processing the root node, which we must skip in this generator. Add explicit handling for group nodes, enabling us to receive callbacks from QDocIndexFiles to add content for these pages. Task-number: PYSIDE-1088 Change-Id: Id72d589a51fc7aae21ad5cdbb3c1dfa78d4c23ae Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: WebXML output format: Fix issues with example pagesTopi Reinio2019-09-265-83/+223
| | | | | | | | | | | | | | | | | Since QDoc no longer stores example files as nodes in its tree, the WebXMLGenerator failed to generate output for those files. Fix this by generating those pages explicitly as needed, overriding functions from the Generator base class. Prevent QDocIndexFiles from writing nested <page> elements when WebXMLGenerator is in use, as that does not work as expected with shiboken2. Fixes: PYSIDE-1088 Change-Id: I01c2af2391726f448271fdb810ffc3da923caca5 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Explain that property editor cannot handle custom class propertiesLeena Miettinen2019-09-201-11/+18
| | | | | | | | | That is, Q_PROPERTY types for custom types that have been declared with Q_DECLARE_METATYPE(). Fixes: QTBUG-17816 Change-Id: I48c33af13d85b877596caca4fbd1103bf383d6e8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qdoc: Fix issues with related non-membersTopi Reinio2019-09-203-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The \relates command sets a node as a related non-member of another node, and sets that node as the new parent. However, the old parent still holds a pointer to the newly-adopted node; this is needed for searching. Some locations in the code did not handle the possibility of parent's children reporting a different node as their parent. Skipping these nodes when traversing the node tree eliminates duplicate entries from .qhp files. These duplicates are however needed in the .index files for linking to work, as links may reference both the global namespace and the scope the node relates to. Remove these duplicates from .qhp files, and omit parent names when generating 'id' attributes for related non-members. This reverts the .qhp content to what it was in Qt 5.12. Parents of related members must be skipped when resolving the full name of the node, otherwise searching for the name is likely to fail. Non-members related to a header file did not receive a valid location ('href'). Task-number: QTBUG-78474 Change-Id: Ie126219e8101beaa051f2f4a1a9f93c731fc8168 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Do not prefix related non-members with a parent scopeTopi Reinio2019-09-121-2/+7
| | | | | | | | | | | | | | The fact that a related non-member has a parent-child relationship with the node it relates to is simply an implementation detail in QDoc - it should not be visible in the generated output. The same applies for proxy nodes - i.e. aggregates that hold children documented in another module. Fixes: QTBUG-77960 Change-Id: I8d83ee7022d5f15af720cbd65c138be0469d39a0 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Remove superfluous '#' symbol from generated linksTopi Reinio2019-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | This sneaky regression happened as a result of rearranging the inheritance tree of Node-derived classes. HtmlGenerator::linkForNode() intends to add #anchor to a link if it's associated with a Node that does *not* generate an .html page of its own. It did this by checking whether a page is an Aggregate. However, since the node tree refactoring, TextPageNode instances are not Aggregates but do generate .html pages. This caused excess '#' to be added to all links pointing to a \page. Luckily, we have Node::isPageNode() which is designed for this purpose - it tells whether a node has an .html file associated with it. Fixes: QTBUG-78040 Change-Id: Ie847c69c4df79075e950aea1ea30c0dcea4f2e4b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-082-7/+18
|\ | | | | | | Change-Id: I0015980f763599ca60f28dd3408531d2a532cd6a
| * lupdate: Warn about calls with template literalsKai Koehne2019-09-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | JS template literals do not really mix well with the Qt Linguist toochain, at least if template arguments are used: This makes the source string dynamic. So far qsTr(``) calls were just ignored. Now lupdate prints a warning. Task-number: QTBUG-76265 Change-Id: I935c382695a86ecd6fd076b31a68fa987be8fd84 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * distancefieldgenerator: Fix performance when selecting unicode rangesEskil Abrahamsen Blomfeldt2019-09-031-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling the QItemSelectionModel::select() function that takes a single index is extremely slow, so for large ranges that span e.g. 20000 glyphs in the font, such as some of the Chinese ideographic ranges can, the application would appear to freeze for many seconds while updating the selections. Instead we use the overload that takes a QList. Metrics: For a specific CJK font, this reduces the time taken when selecting a single unicode range from 30 seconds to 70 ms. [ChangeLog][Distance Field Generator] Improved performance when selecting unicode ranges in large fonts. Task-number: QTBUG-77499 Change-Id: I7ed9bec26b3cbc7e273d305f270a4a6690a81407 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-2410-15/+6
|\ \ | |/ | | | | Change-Id: Id2b91b27583724cfd289f264724aa780edcccbde
| * Doc: Update info on full-text searchLeena Miettinen2019-08-192-15/+6
| | | | | | | | | | | | | | | | | | Update screenshot. Fixes: QTBUG-65064 Change-Id: Ic8d1201e0f2947419836d633bc53997d009d646e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Doc: Update screenshotsLeena Miettinen2019-08-198-0/+0
| | | | | | | | | | | | Change-Id: I31313d1d941a0fe37bd515b5e52b5a471e6167e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | qdoc: Avoid errors related to PCH usageTopi Reinio2019-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove whitespace from the default parameters passed to Clang, and add '-ferror-limit=0' to disable the error limit. This helps to ensure we get a usable precompiled header on all platforms. Another issue that manifested on Windows was the order in which the (temporary) module header and the PCH was built - after writing the module header, its QFile was closed at the end of the function scope, and it received a timestamp later than the PCH. Some versions of libclang see this (rightfully) as a problem. Close the module header file handle before generating the PCH. Task-number: QTBUG-75053 Change-Id: I61d066c40eddfdfdcc4c8cd847f6bec40652f9e0 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix applying font and option settingsJarek Kobus2019-08-213-35/+26
| | | | | | | | | | | | | | | | Move the code which applies changes to applyChanges() method. Fixes: QTBUG-77399 Change-Id: Ic4436ce65e246c518a6fcdfe119df772a0585468 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-171-1/+1
|\ \ | |/ | | | | Change-Id: Ibd977a3a67db311434dc5062f23e4f7f270dbbb0
| * distancefieldgenerator: Fix garbled text with large fonts on little endianEskil Abrahamsen Blomfeldt2019-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing the texture index of each glyph into the font, we would first do toBigEndian() on an int and then truncate this to quint16, causing the texture index to be 0 for all glyphs on little endian systems. This would cause glyphs that were not located in the first texture to be garbled in the output. [ChangeLog][distancefieldgenerator] Fixed broken text rendering when generating large glyph sets. Task-number: QTBUG-77501 Change-Id: I7c2d31a6e57182f440d7f78bd6305109846ccb75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | qtplugininfo: don't abort on missing userdata if we don't careDavid Faure2019-08-061-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins *for* Qt have a MetaData object with Keys, but application plugins don't necessarily have that. Let's still make qtplugininfo useful for those plugins as well. Before: $ qtplugininfo /usr/lib64/plugins/kcm_colors.so qtplugininfo: /usr/lib64/plugins/kcm_colors.so: invalid metadata, user data is not a JSON object After: $ qtplugininfo /usr/lib64/plugins/kcm_colors.so IID "org.kde.KPluginFactory" Qt 5.13.0 (release) qtplugininfo: /usr/lib64/plugins/kcm_colors.so: invalid metadata, user data is not a JSON object Change-Id: Icfe55e4d1749b5d31db1787883487f33987263b3 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | qdoc: Fix "Inherited By" outputMartin Smith2019-07-3110-304/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Inherited By" list was incomplete for QObject (and other classes) because classes that inherited QObject from modules outside QtBase were not being included. This update cleans up the maintenance of a class's base class and derived class information so that the "Inherited By" list is more correct. Note that the "Inherited By" list can't be guaranteed to be complete because, for example, classes in external modules might inherit QObject, but if those external modules are not listed as dependencies of QtCore, QObject won't know about those classes. Task-number: QTBUG-77126 Change-Id: Ia0be361f9e909fee04e9680d4219c96812306712 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-301-1/+5
|\ \ | |/ | | | | Change-Id: I0e4b55a4dd87223f15a6933b45e5bcb8c41ee439
| * Qt Designer: Enable editing of current datesFriedemann Kleint2019-07-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | Qt Designer uses QLocale::ShortFormat for its date editor, which has a 2 digit year. This causes the year to expanded to the wrong year (99->1999) for the maximum value and other issues. Fix by making the year 4 digits. Change-Id: I6cb73c5027f340706f44cd5fe3bfec5e90facb46 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Doc: Replace "return 0" with "return \nullptr" in QDoc's node.cppPaul Wicking2019-07-231-5/+7
| | | | | | | | | | Change-Id: Idfaf778aa13cb461bb9e0db344033aa8147a51d3 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Fix the \reimp command outputMartin Smith2019-07-225-19/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qdoc finds \reimp in a function node comment, it searches the parent class node's base classes to find the function node for the function that is overridden. When it finds this node it prints the "Reimpliments: Yyy::Xxx()" line in the current function node's documentation. This was not working correctly when the reimplemented function was in a different module. The problem was that the fact that the function in the base class had been documented was not recorded in the index file. This update fixes that problem. Now every element that was documented is given the "documented" attribute in the index file set to true. Sometimes, \reimp is used to say that a function reimplements an access function for a property in a base class. This update handles that case as well. See QToolButton::sizeHint(), for example. This change introduces a 6 new qdoc errors in QtBase about \reimp functions for which a documented base class function was not found. Change-Id: Idd444958c3118ade97642bf84781166e6ca8f036 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Add hasDoc() test to findOverriddenFunction()Martin Smith2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qdoc finds \reimp in a function node comment, it searches the parent class node's base classes to find the function node for the function that is overridden. When it finds this node it prints the "Reimpliments: xxx()" line in the current function node's documentation. But the search for the overridden function is meant to be recursive. It was working recursively, but the search was ending prematurely on a function node that had no documentation. In that case, the search should go higher in the inheritance tree to find an overridden function that is documented. This update adds the hasDoc() test to that search function to ensure that the final matching function does have documentation. Change-Id: Iaf6481f8b3aa98df0d0ef188912f1338316f079a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Add hasDoc() test to docMustBeGenerated()Martin Smith2019-07-161-1/+1
| | | | | | | | | | | | | | | | | | Even if a class declaration appears in an _p.h file, a doc page must be generated for it if hasDoc() returns true for the class node. Task-number: QTBUG-77026 Change-Id: I6ca7d614383aadfb6ffcae1c8e021d2998de6a9d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-161-1/+1
|\ \ | |/ | | | | Change-Id: I0b7c7105d6c6df81a1c955b7edf475b5f173c1d2
| * CMake: Ensure unique lst file name in qt5_create_translationKai Koehne2019-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | get_filename_component(... NAME_WE) will remove all suffixes, so files like myapp.de.ts and myapp.en.ts will return the same base name. To just remove the .ts, we could switch to NAME_WLE, but that was only introduced in CMake 3.14 it seems. But why bother at all? The lst file name doesn't have to be pretty... Fixes: QTBUG-76723 Change-Id: I42e46310fe5e9cfb0a82f303ade700f3f0b1b600 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | qdoc: Correct algorithm for finding class qualifierMartin Smith2019-07-111-11/+14
| | | | | | | | | | | | | | | | | | | | | | The algorithm for finding the class qualifier for the function name in a \fn signature was incorrect in cases where the return type also had a class qualifier. This resulted in some clang error messages being printed when they should not have been printed because the class was marked internal. This update corrects that algorithm. Change-Id: I02983710c73251b8fc75ccb2893ae1d9f5aa0fe6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | lrelease: Fix crash on projects without TRANSLATIONS assignmentJoerg Bornemann2019-07-101-1/+3
| | | | | | | | | | | | | | | | Add missing nullptr check. Fixes: QTBUG-76930 Change-Id: I2dc99db43b12cebc6fbe9024057ba963e0ae470f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Fix incorrect include statement in qthelp.qdocconfTopi Reinio2019-07-101-1/+1
| | | | | | | | | | Change-Id: Idabe3da9104c3b0d590146d320faff547cfaa7c4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-097-0/+7
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iced8f21af188b249a0ac59f71fa2fb7cb6a52869 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: Complete documentation lupdate and lreleaseNico Vertriest2019-07-082-21/+97
| | | | | | | | | | | | Task-number: QTBUG-76289 Change-Id: If51fa339cd65d793e8f83a358561bf3be340a0ce Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Correct function signatures from header filesMartin Smith2019-07-051-3/+6
| | | | | | | | | | | | | | | | | | | | This update fixes a regression where the signatures of global functions declared in header files were being erroneously qualified with the name of the header file. The incorrect qualification is removed. Task-number: QTBUG-76822 Change-Id: I59ddee9cdeb5cad45afab7f0b4a50e90bde1578c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Correct wrong related non-member linksMartin Smith2019-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | The summary lists for subclasses were being populated with members of the bases classes of the subclass, which was wrong. This update corrects that problem. More testing is required to ensure that this fix does not introduce regressions. Task-number: QTBUG-76812 Change-Id: Ife7242e99f57c90326d8315ffb3d8175fb9dc8b6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Revise ClassNode::docMustBeGenerated()Topi Reinio2019-07-041-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier implementation was incorrect as it omitted generating output for classes that have only non-function members. Also, it incorrectly generated output for private, non-documented classes. Simplify the criteria for generating output; filtering based on the appearance of 'Private' string is not necessary for Qt, and may cause problems for projects external to Qt. Fixes: QTBUG-76892 Change-Id: Ieee6a693f887cbc0244753298f13a9b411801d56 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Ensure that doc for header file nodes is writtenMartin Smith2019-07-042-3/+21
| | | | | | | | | | | | | | | | | | | | This update fixes a regression caused by the introduction of the docMustBeGenerated() function. The doc for header file nodes was not being generated because docMustBeGenerated() returned false for the header file nodes. Change-Id: I8bafd9e2ae96f41c8e7592403e3d9722797e5c24 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.13.0' into 5.13Liang Qi2019-07-026-78/+94
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qdoc/clangcodeparser.cpp Done-With: Topi Reiniö <topi.reinio@qt.io> Change-Id: I343d2ae6ab3a381756c4476c7f3f5ba0212ad43c
| * | qdoc: Don't log guessed include pathsv5.13.0-rc3v5.13.05.13.0Martin Smith2019-06-111-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A complaint about excessive logging was received because of the logging of each guessed include path when qdoc is not given any include paths at all. This update removes the logging of those lines and changes the remaining single log line to: No include paths passed to qdoc; guessing reasonable include paths Task-number: QTBUG-76204 Change-Id: I000ee7959f00f654e750ac1b68a0c2b6dcccd472 Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8e3c53a196f66a1c9a370cda1dfde51792f92364) Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | qdoc: Fix regressions in include path handlingTopi Reinio2019-06-071-54/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 50a172f8 broke the way QDoc parses include paths passed from qdocconf files by always prepending them with '-I'. While this ensured that Clang uses them as include paths, QDoc no longer found module headers local to the documentation project as '-I/path/to/module' is never a valid file system path. This change fixes the issue and removes duplicated and unnecessary code. Fixes: QTBUG-76279 Change-Id: I7006000ec6be823afd10bae59eb88780ccf32b23 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | qdoc: Ensure Generator::fullDocumentLocation() returns a non-empty stringv5.13.0-rc2Topi Reinio2019-06-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function took the parent node's location without checking whether the parent is the root namespace. For example nodes (and possibly others), this meant that we got an empty location. This in turn resulted in QDoc omitting the 'href' attribute when writing an .index node entry for an example node, and consequently, linking failures. Fixes: QTBUG-76171 Change-Id: I984ada1b88468aab71d08ba7d102bd8661304dab Reviewed-by: Martin Smith <martin.smith@qt.io> (cherry picked from commit b18d7b5b4a9bc516bea9f36e3b00084cf6f11e26) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | qdoc: Accept include paths without -IMartin Smith2019-06-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update lets qdoc accept include paths with or without the -I and with or without a space between the -I and the path. Without the space is preferred. Task-number: QTBUG-74675 Change-Id: I4a1dcc04a3c9a6586e24b50bccf0f1f37d02ed4c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e33ac6f1b1ebb882684f24f7d026267584d9393a)
| * | qdoc: Drop '-I' prefix from module header pathv5.13.0-rc1Topi Reinio2019-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under certain conditions the '-I' prefixes survive in the list of resolved include paths. Fixes: QTBUG-76026 Change-Id: Ie3543b5aa8b88d8021175b3168ab8de8a4497878 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | qdoc: List obsolete QML members in obsolete QML members filev5.13.0-beta4Martin Smith2019-05-152-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was building the obsolete QML members files incorrectly. It was listing the active members when it should have been listing the obsolete members. This update fixes that bug. Task-number: QTBUG-75785 Change-Id: I37a5469cd51c5b15bf3edac9e8bd98c2894bef1e Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | qdoc: Fix \headerfile generationTopi Reinio2019-05-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 72eac2f5 introduced a regression where \headerfile pages never generated any output. Since that commit, Node::docMustBeGenerated() is called for HeaderNodes, and we need to override it; otherwise the default base implementation gets called, and it simply returns false. Fixes: QTBUG-75790 Change-Id: I4932d5ba8dd595ad4d18033f77e62b14b54f8263 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | qdoc: Fix issues with shared comments for QML properties/methodsTopi Reinio2019-05-082-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were multiple issues with QML properties, methods, or property groups that share comments: As we don't handle \qmlpropertygroup anymore, QDoc assumed that every \qmlproperty that shares a comment belongs to a property group, and tried to resolve the group name. But for some properties, there is no group name as they are just properties sharing a doc. For details section of QML reference page, any shared comment was assigned to 'Method Documentation', which is clearly wrong. Also, fix a typo where we looked for C++ functions when generating QML method documentation. Fixes: QTBUG-75647 Change-Id: I11cef407b39fdc926a5410b867e8b17a8d769937 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: Sort qualified names correctly in generateCompactList()Martin Smith2019-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc was not sorting qualified class names correctly for inclusion in the All Classes list. For example, QAttribute (Qt3DRender) was being placed in the list in the position for Qt3DRender::QAttribute instead of the position for QAttribute (Qt3DRender). This update corrects that bug. Task-number: QTBUG-76506 Change-Id: Ie837ab45e20569b4afd578341dbce9ee6fd9c08b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-275-23/+157
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3a828f7cf61510f0bb179b760c8a335629d3c852
| * | qdoc: Avoid duplicating version strings in HTML <title> elementTopi Reinio2019-05-311-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 802aa37f introduced full version strings into the titles in HTML header. However, for pages that already included a prefix of the version information (e.g. 'Qt 5.13'), this meant that the version appeared now twice ('Qt 5.13 5.13.0'). This commit checks for the presence of a version prefix in the title and only appends the full version if one is not found or does not match with the project version (which for Qt modules is QT_VERSION). Fixes: QTBUG-74301 Change-Id: Iceb3cf8f0e0181709e547a87cb6e92a6a13dcfef Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
View Lorry Controller Status