summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Add changes file for Qt 5.13.0Antti Kokko2019-05-131-0/+37
| | | | | | Change-Id: I5086b60e0c23f990c65ae386eb4ea8f74d43893d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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: Make QDoc warn about undocumented public classesMartin Smith2019-05-0611-40/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc was marking all undocumented public API elements as "internal" and "private" because most of these undocumented elements should not be documented. The standard way to tell QDoc not to warn about an undocumented elemewnt in the public API is to give it a QDoc comment with the command "\internl" in it. But it was decided this would require too much work to eliminate all the warnings, because there are so many undocumented elements in the Qt public API that we really don't want to be documented. So we decided to just mark them all as both internal and private in QDoc itself, and that eliminated a great many useless QDoc warnings. But it also meant that QDoc would no longer warn when a public element was left undocumented by mistake. This is most often seen in C++ classes that are in the public API but are not documented. QFutureInterface is an example of a class that is not documented but should be documented because it is useful. This change lets QDoc warn that a class in the public API was not documented with a \class comment. Special cases: 1. If the undocumented class has no members, don't warn that it was not documented with a \class comment. 2. If the undocumented class's name contains the word "Private" it is probably not meant to be in the public API, so don't warn that it has no \class comment. 3. If the undocumented class has no function members, then don't warn that it has no \class comment. 4. If the undocumented class is marked DontDocument, then don't warn that it has no \class comment. The other part of this change relates to item 4 above. To mark a class or struct as DontDocument required adding a new topic command to QDoc. The new topic command is \dontdocument. The argument to this command is a list of class and struct names. The list is enclosed in parentheses. For example: \dontdocument (QMacAutoReleasePool QIncompatibleFlag ... QTextCodec::ConverterState QThreadStorageData) QDoc looks up each name in the list and marks it DontDocument. The documentation generator then sees the node is marked DontDocument and ignores the node. This makes it a lot easier to tell QDoc which public classes and structs should not generate the warning about no documentation. Task-number: QTBUG-57183 Change-Id: I7eee48de03ca7aeb72c63ae90ba373503d41612d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Fix \headerfile requisite table and title generationTopi Reinio2019-05-063-4/+11
| | | | | | | | | | | | | | | Using \headerfile did not call addIncludeFile() on the Aggregate, so the requisite table in the generated HTML contained an empty '#include <>' statement. Also, remove the 'Header' prefix from the generated title, as it produced titles that look odd, e.g. 'Header Global Qt Declarations'. Replace the title with a full title that contains the name of the header file, e.g. '<QtGlobal> - Global Qt Declarations'. Task-number: QTBUG-75570 Change-Id: Iccc248dcbcbfee85ca15e802e671ffcf9b9c10fe Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-041-2/+5
|\ | | | | | | Change-Id: I1b28c85a9fea6b0e19351a5e70fdd1eb061919f6
| * Assistant: Highlight the whole search phrase if enclosed with quotesAndy Shaw2019-04-291-2/+5
| | | | | | | | | | Change-Id: Idd65fa2c3313ca240b9c2721e886dd31ebfe7f00 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Doc: Clear 'moduleheader' for tool manualsTopi Reinio2019-05-035-1/+6
| | | | | | | | | | | | | | | | | | These manuals contain no C++ API documentation, and there is no associated module headers - clearing the moduleheader variable in documentation configuration stops QDoc from warning about them. Change-Id: I71b8ec81800025d9de18b83871a9881c1246f153 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Avoid generating invalid htmlMartin Smith2019-04-263-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test qdoc file and qdocconf file provided with QTBUG-74903 gets qdoc to generate the html file shown below. The line "<li>Test Guide</li>" is invalid html. It is meant to be part of the navigation bar. This update prevents the generation of that line, when the navigationbar Text object is empty when the invalid line is about to be added. <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <!-- test.qdoc --> <title>Test Guide | Testing</title> </head> <body> <li>Test Guide</li> <div class="sidebar"> <div class="toc"> <h3><a name="toc">Contents</a></h3> <much of html file deleted> </body> </html> The test input html file actually contained an invalid line that qdoc generated erroneously. This update just removes that invalid line. Task-number: QTBUG-74903 Change-Id: I9e8d742676ac8c7c536c73c8f5b98d27aafbd3c7 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-2447-121/+338
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qdoc/qmlmarkupvisitor.h src/qdoc/qmlvisitor.h tests/auto/qtattributionsscanner/testdata/good/expected.json Done-With: Kai Koehne <kai.koehne@qt.io> Change-Id: I180ee214d1e5999fc1279b092bd9214b6bf8f858
| * QDoc: Add llvm-config-9 as llvm detection candidatePaul Wicking2019-04-231-0/+1
| | | | | | | | | | Change-Id: Iceeaa8f64e1168efb5f7e9133e5ef51e2dea367b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+24
| |\ | | | | | | | | | Change-Id: I46e92ea28189b7365b34ba42de395be5293ef2af
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b4597180191734ca128772d2b8547c6e6c08efa2 macdeployqt: Deploy the platforminputcontext plugins and vkb plugins + a7aaa84f0c18c150e7d7671663a175d99cad3d49 qtdiag/Windows: Output all graphics adapters + 11d01e3b74c84e465246a8f164b3f3b8ff92d8a4 Handle recursion depth errors when parsing JavaScript + 9b5c31944fb03eea6025186c27cf809cc4a9ae05 Designer: write out minimumSectionSize property before current size + 30616088b98b4f95f85993c069c8086d36151caa Handle recursion depth errors when parsing JavaScript in lupdate + c7dbb12a734b4203c3613ae3950b2e7729643d66 Use High DPI pixmaps in assistant + 44348513f90bd24674172b87a97e0c8b615a555a Bump version + 9c7502b0e5056da021ace0195e53d5b7b410120b Assistant: Rewrite the search result list formatting to use QTextStream + e9662ddd86f027bdbe617f5171cd63cae13b3845 qtattributionsscanner: Add "PackageComment" field + 9beac9838510e94338377fcd1cfc68b371f32a86 makeqpf: fix crash + 50335cb26bb88930f5e2a204642439cc9a4d2282 Mark throwRecursionDepthError() as final Change-Id: I68c23bd2395968511f70209bfcc9496355b0b734 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | qdoc: Don't include shared comment nodes in summary sectionsTopi Reinio2019-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused empty table cells in 'Public Types' for several C++ classes. Task-number: QTBUG-74779 Change-Id: I701967e26955c7807e2f777bb43f67a0ea1c1edb Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Fix a crash when closing the Manage Bookmarks dialogJarek Kobus2019-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, we have deleted the bookmarks dialog directly from it's closeEvent. It means that its closeEvent invocation wasn't finished yet -> crash. We use deleteLater now instead. Task-number: QTBUG-72218 Change-Id: Ia83f9d2027a63ccaccebe22a8e5d92e808bec2bd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | CMake: Fix policy warning CMP0058 when using qt_create_translation(...)Kai Koehne2019-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly declare the generated _lst_file that lists all lupdate input files as a BYPRODUCT. This is required by the Ninja backend to properly track the build dependencies, and fixes a CMake warning CMP0058. Task-number: QTBUG-71354 Change-Id: Idb3481ef1f0d6763ce14849ca57cb12647d41703 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | lupdate: Escape special characters when processing QMLLucie Gerard2019-04-034-65/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | The transcode function is now in a parser tool class. It is used by the cpp and qml parser. Fixes: QTBUG-40639 Change-Id: I3c9c9d137669900642a077cf81a739bfc31be800 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | qdoc: Add support for CMake commentsKai Koehne2019-04-022-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake uses # as a line comment marker. To detect CMake files we check for the suffix .cmake, or check whether the filename is "CMakeLists.txt". See also https://cmake.org/cmake/help/latest/manual/cmake-language.7.html [ChangeLog][qdoc] qdoc now uses #! as a snippet marker in .cmake, CMakeLists.txt files. Task-number: QTBUG-73058 Change-Id: I230b113f0d49dd487b0f1926c815295a8a660a27 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Convert \r into a numerical entityLucie Gerard2019-04-022-3/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41562 Change-Id: If03df28095212f2ee9f74eeaf03c50a6f1203415 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | lupdate: Do not touch a translated file without target languageLucie Gerard2019-04-0221-14/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][lupdate] lupdate will now generate an error if it is asked to update a .ts file with translations, but without a target language. This is to ensure that plural translations are not destroyed. Fixes: QTBUG-53775 Change-Id: I646c1f2ec42a32dbc1a4676ad784887613607b78 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Add forward looking after ColonLucie Gerard2019-04-013-2/+60
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colons seen are remembered in order to identify a member or base class identifier. In case of declaration of a bit field, the colon should be ignored. If it is not, unexpected behaviors compromise the resolution of the context, when the context is not explicit in the tr() function. To differentiate between colons in a member or base class identifier, and colons in a bit field, this patch implements a heuristic: We parse forward to either a '{', or a ';'. If it is a semicolon we assume it's a bit field, if it is a curved open bracket we assume the colon is for a member or base class identifier. Related auto test in case of bitfields declaration added. Task-number: QTBUG-55479 Change-Id: I2ca1124c192e4ab16fd449afc634a5de5023f481 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Mark throwRecursionDepthError() as finalUlf Hermann2019-03-273-3/+3
| | | | | | | | | | | | Task-number: QTBUG-74510 Change-Id: I4c6e20a55d76e308808f091fb224ee5c612bc239 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * makeqpf: fix crashRaymund Apfelboeck2019-03-261-5/+9
| | | | | | | | | | | | | | | | | | | | Also fix generation of special characters like space [ChangeLog][makeqpf] Fix assert when rendering font using debug build of Qt Fixes: QTBUG-46544 Change-Id: Ic17ee44973d3f85b5d2ae4423a059223abd52ea5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * qtattributionsscanner: Add "PackageComment" fieldKai Koehne2019-03-258-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new field that can be used for general purpose comments about the package, not to be included in the generated qdoc documentation. JSON does not support comments as a first-class concept. A common workaround is to use duplicated key entries, so that the first one can be used as a comment field. Anyhow, this is arguably a hack and not common knowledge. The name is inspired by the "PackageComment" field in SPDX. The new feature should already be made part of 5.12 so we can clean up version information that recently became more prominently visible as part of the qdoc title - see https://doc.qt.io/qt-5/licenses-used-in-qt.html Change-Id: Icfe843d1d725618114442687222c24122d0dd6b9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Assistant: Rewrite the search result list formatting to use QTextStreamFriedemann Kleint2019-03-221-23/+24
| | | | | | | | | | | | | | Task-number: QTBUG-74353 Change-Id: Ia1a08949d26bbfa288b83a2553f181c587296d3b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I839259639ef0598cdace77b29ec484b0f6f388a2
| * Use High DPI pixmaps in assistantAlexander Volkov2019-03-201-0/+1
| | | | | | | | | | | | Task-number: QTBUG-61052 Change-Id: Ia8e1953535a3bb46f8c5615e204ef1b4b78cd9dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix an .icns issue with macOS 10.12Alessandro Portale2019-04-175-0/+0
| | | | | | | | | | | | Task-number: QTBUG-74497 Change-Id: I9d1c2c4b31f58c7f0de64cfde093826563cddeae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qdoc: Allow QML/JS types with the same name as the parent modulev5.13.0-beta3Topi Reinio2019-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | QtMultimedia QML module contains a QML type QtMultimedia. QDoc was overriding one with the other because the search function returns both types of nodes (as they have the same genus, 'QML'). Fix this by checking that we actually found an existing type, not a module. Task-number: QTBUG-75186 Change-Id: Id7a151d6db137fd337e4dd68ebe7c8aa08ed80e0 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Pixeltool: Fix some subpixel mode pitfallsAlessandro Portale2019-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | Switching to one of the subpixel modes while having a zoomfactor below 3 made increasing the zoom (via context menu) impossible. Also, increasing/decreasing the zoom level via +/- keys did not happen in steps by 3 like when increasing/decreasing via context menu. Change-Id: Ibf69bc6247c74b960614b99df81a227ca57f5d5f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | qdoc: Allow replacing file lists on \example pages with a link to a URLv5.13.0-beta2Topi Reinio2019-04-094-10/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source and image file lists that are automatically generated at the end of example pages have outlived their usefulness, at least for Qt docs. When browsing example documentation offline via Qt Creator's Help, the user has typically already opened the example project. For online documentation, a better option is to link to a remote repository where the user can browse the example's content. This commit adds a new configuration variable 'url.examples' - if defined, file listings are omitted and a link is constructed for each example based on the parameter passed to the \example command and the 'examplesinstallpath' configuration variable. Task-number: QTBUG-74391 Change-Id: If1f76ee34c5e50236fae626f251e00bf24c1045d Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Allow namespace members to use \relatesMartin Smith2019-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | It had been required that \relates could only be used to relate global entities to a class. This change allows \relates to be used in the comments of entities in a named namespace. There are several cases in qtextstream.cpp Change-Id: I17b61dbdaf6b6bd8c420a2fa1fd9deef6b7125dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* | qdoc: Turn off clang errors in PCH build without include pathsMartin Smith2019-04-082-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the build system can't pass qdoc the include paths to qdoc, qdoc tries to guess reasonable include paths. There has been one case running qdoc on macOS for the QtPlatformHeaders module, where qdoc must try to guess the include paths. The guessed paths are not sufficient, and clang prints a large number of errors caused by missing stuff. This change tells clang not to report errors during the PCH build if qdoc had to guess the include paths. qdoc reports in its log that it guessed the include paths and that it turned off the clang error reporting. Change-Id: I91a4242dcc7d3017d511d969621cc3d673c47963 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Don't report override error when reimp is usedMartin Smith2019-04-053-5/+16
| | | | | | | | | | | | | | | | | | | | qdoc was reporting an error when the reimplementation of a virtual function that was documented in the base class was given a qdoc comment in the derived class that only contained the \reimp command. When the reimp command is used, the error should not be reported. This change implements that. Change-Id: I6905e35b4e9c3df12617446c04eb9ea6d1804832 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Add missing override keywordsMartin Smith2019-04-032-2/+2
| | | | | | | | | | | | | | | | | | qdoc redeclares two virtual functions from the QML parser in qtdeclarative. These declarations were missing the override keyword, so this update adds it. Change-Id: Id7db696e22750f0f5649cee5121e8f491cb8f114 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Search for QML type before creating itMartin Smith2019-04-0213-145/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we have QML types that represent C++ classes, it is possible for qdoc to process a \qmlproperty command before it has processed the \qmltype for the QML type where the QML property belongs. This is because the \qmlproperty command can appear in a different .cpp file from the one containing the \qmltype command. If the .cpp file is parsed first, the QML type node won't exist when the \qmlproperty is processed, resulting in a qdoc error. This update forces qdoc to always check for the exist of the QML type before creating it and before creating any QML properties for it, and if the QML type does not exist, create it. If it does exist, use it. Change-Id: I78705aa95ee5bf3abc2e17fb2b6cd52191d54b68 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Eliminate need for the property group commandsMartin Smith2019-04-0212-449/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have been using the \qmlpropertygroup command to document complex properties. we also have the \jspropertygroup but it hasn't been used. However, we also have the shared comment concept, which we have used for documenting groups of functions. This update changes qdoc to use the shared comment concept for QML and JS property groups. The property groups commands are therefore no longer needed. But there are several uses of the \qmlpropertygroup command, and qdoc still recognizes these, although it uses the shared comment concept to handle them. The property group commands will be removed from the qdoc manual in a later update. Change-Id: Ie98638546756fd1a70067a7cd483c3b962c02954 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Purge xmlpattern dependency from qttools documentationAlex Blasche2019-04-011-2/+1
| | | | | | | | | | | | | | The qtxmlpattern will become obsolete in Qt 5.13. Change-Id: Id5e67d4681f3fde9d09705aea3377727db71e964 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | linguist: Don't translate HTML-tagsRobert Loehning2019-03-281-5/+7
| | | | | | | | | | | | Change-Id: Ifaaa316c5ed0273790e9957d04f0c36c08803eb8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | assistant: Mark QCompressedHelpInfo, QHelpFilterdata as finalKai Koehne2019-03-273-6/+4
| | | | | | | | | | | | | | | | These are value classes that are not supposed to be inherited. Mark them as final and remove any virtual destructors. Change-Id: I86d42f8340e6c7b6013c6ed135079ecd9bd44cfb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | QHelpFilterData, QCompressedHelpInfo: Add swap() methodFriedemann Kleint2019-03-274-0/+20
| | | | | | | | | | Change-Id: I4be504cc4de6a6552b61108d0dd00d79d46308b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-03-2011-21/+99
|\ \ | |/ | | | | | | | | | | Conflicts: src/qdoc/configure.pri Change-Id: Iffd359fb2fa1480ea08253ef85bf2beff3ba188d
| * Handle recursion depth errors when parsing JavaScript in lupdateUlf Hermann2019-03-191-0/+7
| | | | | | | | | | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Task-number: QTBUG-74510 Change-Id: I0081d2d2e4385402022a6eb8b046e82ebd68983c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Designer: write out minimumSectionSize property before current sizeChristian Ehrlicher2019-03-181-16/+18
| | | | | | | | | | | | | | | | | | | | Make sure that minimumSectionSize is handled before currentSectionSize so a current section size lower than the default minimum section is properly handled. The same is done for QtBase in 7aa1078ecb8afd96050771635c0d3fa4238d3338. Change-Id: Id33ff11ef35cc92e0adf13402dc847b8f45c38a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
View Lorry Controller Status