summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-1845-156/+296
| | | | | | | Plus additional adjustments. Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-18521-9841/+82710
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
| * Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-03-171-2/+2
| | | | | | | | | | Change-Id: Ibfab5feee4f62201d0ab4ec12a3ecfaca92466f7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QDoc: Remove \contentspage codePaul Wicking2020-03-112-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | The \contentspage command has been unused since Qt 5.3, and the documentation was removed in 5.15. Remove the related code. [ChangeLog][qdoc] - The \contentspage command is removed. Fixes: QTBUG-75170 Change-Id: I47c7e5c35154ed0d16f7a4584015b4a338735bbe Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devPaul Wicking2020-03-1152-376/+763
| |\ | | | | | | | | | Change-Id: I7956e542a44db1a4e5589dccc267b7c306a50975
| | * QDoc: Add warning to use of \contentspage commandv5.15.0-beta2Paul Wicking2020-03-119-44/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The \contentspage command doesn't produce nav links to the contents page between the next and previous pages. QDoc hasn't generated these links in html output since Qt 5.3. Remove the documentation that refers to the command and add a warning that it should not be used.. Task-number: QTBUG-75170 Change-Id: Ib16fc1cbb1e661a7519ba650e655e209c3b45b68 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Enforce zero warnings for QDoc's generatedoutput autotestTopi Reinio2020-03-1113-45/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix all QDoc warnings for the tests and set the warning limit to zero. If any warnings are introduced, QDoc will exit with non-zero value and the test will fail. The exceptions are the tests specific to the DocBook generator, where we expect to see two warnings related to shared comment nodes. The generator currently has trouble handling these. Fixes: QTBUG-82808 Change-Id: I0482516e1e34b92592d921a4a0ffb41e4b2b4770 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * qdoc: Fix regression in .index file outputTopi Reinio2020-03-102-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5234c7fc fixed an issue with missing \inmodule commands, but it ended up adding non-aggregates into the module as well which was not the intention. This caused excess nodes being listed as a module members, causing issues for the WebXML output format as well. Partially revert 5234c7fc, fix the issue correctly, and update the test for .index files. Change-Id: I85fc19152b3de8993f92361fbe1ad2fd934c79ae Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * qdoc: ClangCodeParser: Clear the stored namespaceTopi Reinio2020-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After processing a source file, we need to clear any potential stored namespace scope. Left uncleared, if the next source file is not parsed with Clang but still use ClangCodeParser::parseFnArg(), the incorrect scope is applied. Change-Id: Iba1e791ac01c0f1c699a808ce644b4edbb682399 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * QDoc: Clean up whitespace in log messagesPaul Wicking2020-03-093-6/+6
| | | | | | | | | | | | | | | Change-Id: Ib7dbb54c0a2d8ea7b754edc8fb7d2175471acc38 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * QDoc: Clean up log messagesPaul Wicking2020-03-091-3/+3
| | | | | | | | | | | | | | | Change-Id: If65d87e520f228997a857dbbebc13d98fa9ce994 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Add missing QPainterPath includeMitch Curtis2020-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ..\distancefieldmodel.h(197): error C2027: use of undefined type 'QPainterPath' Change-Id: I3c97811a14bb82bf5dabc86398ffcfc9cf4ff58d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Add tests for QDoc's prepare and generate phasesTopi Reinio2020-03-093-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | The prepare test includes validating the generated .index file. Fixes: QTBUG-82716 Change-Id: I673cf39965c81cf02b8c68e0319b45c909664917 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * QDoc: Add unit tests for UtilitiesPaul Wicking2020-03-063-1/+103
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-82687 Change-Id: I41219b8cdc45d7e779acfefbcd57ff352b56b88e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * QDoc: Use correct node type string for \since in shared commentsPaul Wicking2020-03-067-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared comment nodes were not handled as a special case when generating "This [class/function/method/type/etc] was introduced in" strings when QDoc encountered a \since command. These ended up with the default value, "documentation", which led to unexpected text in the documentation. * Add handling of shared comment nodes and get the node type from the first node in the collective. * Amend generated output test to cover this scenario. Fixes: QTBUG-82534 Change-Id: I444e95e0214f312649ec2720c23c98e698402abf Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * qdoc: Add an auto-generated note in \qmlsignal documentationTopi Reinio2020-03-064-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct the signal handler name and generate a note for it. This eliminates the need to maintain such notes in the source. Remove the hard-coded notes from the test source (but not from the expected output data). [ChangeLog][qdoc] QDoc now generates a note for the name of the corresponding handler in \qmlsignal documentation. Task-number: QTBUG-37355 Change-Id: Ia3ab98be909a41bde619224c9a616cb8704e258a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * qdoc: Refactor automatic note generation for function nodesTopi Reinio2020-03-069-169/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function nodes may have a number of automatically generated notes added to the documentation; as they share the same formatting, collect them into a single virtual function in Generator, and override it in DocBookGenerator. Call the virtual function in Generator::generateBody() after generating the text for the Doc instance. As we append the notes to the body, the order in which the notes appear may change slightly (if a function comment generates multiple notes). Add \note commands in the tests in preparation for a follow-up commit that utilizes the refactored code. Task-number: QTBUG-37355 Change-Id: Id92926e53b61e03a2d2feceda70987191b708975 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * qdoc: Fix issues in HelpProjectWriterTopi Reinio2020-03-057-88/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that generates Qt Help Project (.qhp) xml files was suffering from multiple issues - mostly related to changes in Node inheritance that were not reflected in HelpProjectWriter implementation. - We no longer have subtypes for page nodes. Therefore, selectors like 'doc:example' were broken. Simplify the selector code but continue supporting the old notation. - Examples and basic QML/JS types were incorrectly dropped from the TOC. - Node::Union and Node::Struct were called 'Class' in the .qhp. Use the Generator::typeString() to fetch the correct type name for all types. - Require .qhp subprojects to have at least a title to avoid empty subsections in the TOC. Add a test that covers the entire .qhp generation with different types of subprojects defined. Fixes: QTBUG-82671 Fixes: QTBUG-82674 Change-Id: I8fe4a8ad5fc6d58f86e0e9128e98c0b8c4ba4a6a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * Qt Designer: Fix warnings about deprecated style metricsFriedemann Kleint2020-03-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PM_LayoutLeftMargin, PM_LayoutHorizontalSpacing instead of PM_DefaultChildMargin, PM_DefaultLayoutSpacing, fixing: formeditor/formwindowsettings.cpp:11452: warning: ‘PM_DefaultChildMargin’ is deprecated [-Wdeprecated-declarations] formeditor/formwindowsettings.cpp:116:53: warning: ‘PM_DefaultLayoutSpacing’ is deprecated [-Wdeprecated-declarations] A child widget needs to be passed to PM_LayoutLeftMargin to correctly obtain the child margin. Change-Id: Ided8fb45d2372a56bae3a0304c35339fcc3b83ee Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * QDoc: Add basic unit test for ConfigPaul Wicking2020-03-053-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | Starting point for unit testing Config. Fixes: QTBUG-82672 Change-Id: If9e6300d3388173a08545609aca74c8e6a588041 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Qt Linguist: Fix compilationFriedemann Kleint2020-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use QTextDocument::toRawText() instead of private API removed by qtbase/4724dfff627f3cd3754f5d4a827c6b6790a89955. Change-Id: I1b924bf78200f45d33a8e875912c2e31097da41f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-03-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Iaea9aa38f472c002747935228c06db39f0fed512 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Qt Designer: Fix build with regards to QOpenGLWidgetFriedemann Kleint2020-03-055-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | QOpenGLWidget is now in QtOpenGLWidgets. Change-Id: I9815cf484cdf29cfa3511e400e39fc6731be1291 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devPaul Wicking2020-03-0421-123/+147
| |\ \ | | |/ | | | | | | Change-Id: I211a32a441c5b465321770fc3d14b91eea33fb67
| | * QDoc: Disentangle Generator and ConfigPaul Wicking2020-03-0412-66/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Keep track of use of DocBook extensions in Config. * Let Location query Config about use of Timestamps in logging. * Set writeQaPages in Config and get it from there. * Let Location query Config about whether logging is enabled or not. * Let Config track if QDoc is running in single or dual exec mode. * Move phase information to Config and track the current phase state there. * Remove the inclusion of generator.h from config.cpp, clangcodeparser.cpp. Task-number: QTBUG-82106 Change-Id: I06c8aeb40417e5c83cfa693f5f1ab2c210d34469 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Add an autotest for QDoc's single-exec generation modeTopi Reinio2020-03-044-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test adds no new expected files, as we build two existing projects with a master qdocconf file in single-exec mode. Fixes: QTBUG-82667 Change-Id: I89618a2670c3ab1ddfc71f1a76d9c9fce5947291 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * QDoc: Use logging category over logToStdErrPaul Wicking2020-03-043-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logging category framework for all log messages that used to be issued by logToStdErr. Remove the method so that it doesn't suddenly creep back in. Change-Id: I7ca1152332e65c3698941f94d63de4a5f34902e7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * QDoc: Use logging category over logToStdErrAlwaysPaul Wicking2020-03-045-34/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logging category framework for all log messages that used to be issued by logToStdErrAlways. Remove the method so that it doesn't suddenly creep back in. Change-Id: I65131bd01b5c79d6eab9619d9bb9b7bf6ff279c1 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * QDoc: Add warning about future removal of QA page optionPaul Wicking2020-03-041-1/+5
| | | | | | | | | | | | | | | Change-Id: I3b8225cc6bb175df67d958763597f764acfc8d81 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Fix deprecation warningsFriedemann Kleint2020-03-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use split behavior enumeration from Qt, fixing: qdbusmodel.cpp:308:75: warning: 'SkipEmptyParts' is deprecated [-Wdeprecated-declarations] Remove the dock widget feature settings from Linguist since all features are enabled by default, fixing: mainwindow.cpp:302:45: warning: 'AllDockWidgetFeatures' is deprecated [-Wdeprecated-declarations] Change-Id: I72ada0dcbc81792d8643fc0948d86ea08847a8ec Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Assistant: Add missing "We mean it" comments to private headersFriedemann Kleint2020-03-033-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: qttools/src/assistant/help/qfilternamedialog_p.h does not have the "We mean it." warning qttools/src/assistant/help/qhelpfiltersettings_p.h does not have the "We mean it." warning qttools/src/assistant/help/qoptionswidget_p.h does not have the "We mean it." warning Change-Id: Id9f9ce61f110ad05c7676004f5ac372b275ce634 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-0334-83/+114
| |\ \ | | |/ | | | | | | Change-Id: Iff33dc736e4844af2c1c8e227ef1145d77fc1d85
| | * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-0215-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I7137cf8339bfe9fdcf4cb7cc695cb146aef410fb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Prepare for internal QML Parser API changeSimon Hausmann2020-03-029-34/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the internal API version 8, the SourceLocation will move from QQmlJS::AST to the QQmlJS namespace, and it will get its loc.startLine/loc.startColumn members back. Change-Id: I70ba5a7f7b6eca60298a7b4982bf2cf099110089 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * QHelpFilterSettingsWidget: Fix context of translated messagesFriedemann Kleint2020-02-281-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The q->tr()-calls ended up in the context QHelpFilterSettingsWidgetPrivate. Use the static invocation to fix this. Change-Id: Iec232532e34cae19fac2f06462207170ba40bdca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * qdoc: Parse arguments for an \obsolete commandTopi Reinio2020-02-283-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command was documented as taking no arguments, and any arguments were ignored. The documentation still has many instances of \obsolete Use somethingElse() instead. Where the description was lost. Force a linebreak after the command, allowing any arguments to be processed as a normal text paragraph. [ChangeLog][qdoc] Generate output for arguments passed to the \obsolete command. Fixes: QTBUG-82558 Change-Id: If3e39382367a0c1f4cc63a2c322e986e053ecd6b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Fix path issues in QDoc's generatedOutput autotestTopi Reinio2020-02-266-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since the refactoring, even though the tests pass, QDoc was generating more warnings under the hood as include paths are invalid in multiple cases. Change-Id: Id5bdb894c925c35ce871b2170dbd5e1f0ddc2d74 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * qdoc: Fix warning when accessing a QString outside of its rangeAndy Shaw2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since skipSpacesOnLine() can end up making pos == len then we need to check pos is less than length before querying input_ with that position. This fixes the warning "Using QCharRef with an index pointing outside the valid range of a QString. The corresponding behavior is deprecated, and will be changed in a future version of Qt." Fixes: QTBUG-80346 Change-Id: Ica1c57f616c3efaefd597ebb84e52b17325d22fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I867bda11a1298693cec285183435f4ae399208da
| | | * windeployqt: Use correct file name for ANGLEYuhang Zhao2020-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, the letter "v" is always lower-cased. Change-Id: I3748357f548f62b6ea7f6d1f3ee8d404fec34f8b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-2577-100/+177
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Iabcee67b9cf246cd5f1fe97205ed41b4763210ec
| | * | QDoc: Reorganize expected output testv5.15.0-beta1Paul Wicking2020-02-2164-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the test has grown in size and scope, the lack of structure adds an unnecessary mental overhead when adding new tests, or when attempting to refactor the tests themselves. - Place all testdata in a directory aptly named testdata, following Qt convention. - Create sub-directories for all tests, so that their data is separated from each other. - Update qdocconf-files to match the new structure. - Update expected output data to match changes in qdocconf-files. - Ensure all tests still run; this requires modifications to paths in .qdocconf files mostly, but also in #include directives. Fixes: QTBUG-82159 Change-Id: I43b2333cacc75d1076a8aca86e89ccc52e4ec8a3 Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * | Qt Designer: Add missing extra comments to strings from Palette PreviewFriedemann Kleint2020-02-211-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment was present on the existing strings. Amends 7fd5d435b76460e42cd25004056a39e05f376baa. Change-Id: Ic5a03c3b63a974956845ad2a3d1fb6c7d4df98a2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * | qdoc: Fix behavior with missing \inmodule commandTopi Reinio2020-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc warns about a missing \inmodule command and tells us that it has selected a default (project) name for the module, but this had no effect because we never added the node to the module. Automatically adding the node to the module won't eliminate the warnings, but ensures that a \module page whose name matches the default one is populated with the classes/namespaces as expected. Change-Id: Ib6a949cc2763c254d379ff99b08c60812f45e607 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | qdoc: Remove code for unimplemented command \pagekeywordsTopi Reinio2020-02-216-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This undocumented command was storing a list of keywords in a node. Those keywords were never accessed. Task-number: QTBUG-82310 Change-Id: I144454667c78329a8a03ca81b9b90b047971d301 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | qtdiag: rhi: Output supported texture formats and sample countsLaszlo Agocs2020-02-211-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very useful to discover what compressed texture formats are supported on a given system with a given backend. Also change the OpenGL ES label to be more generic. Change-Id: Iaf44d9ee7e78afaf8d067fc85747f4bae19f00c3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * | Fix coverity warning of uninitialized pointerLevon Sargsyan2020-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initializing Config as nullptr in DocBook class, avoiding potential undefined behavior. Coverity-id: 266393 Change-Id: I0330d86b750f2a972c21875bc776407bc94c81df Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | qdoc: Store and use the current namespace scope for \fn commentsTopi Reinio2020-02-183-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Writing \fn commands for member functions of classes declared under a namespace was error-prone as QDoc required the fully qualified paths for the function signature, even though the documentation comment was located under the correct namespace scope. Store the scope by backtracking the Clang AST until we reach the level of the translation unit, and store each encountered namespace declaration into a list. When generating the temporary source file for an \fn command, we can then recreate the correct namespace hierarchy. This does not break the existing \fn command usage as it's perfectly valid, even if unnecessary, to provide fully qualified paths in the function signature. [ChangeLog][qdoc] QDoc is now aware of the namespace scope of an \fn command without requiring fully qualified paths. Fixes: QTBUG-82190 Change-Id: Ia446c19d130b2ef48b16b67e4dfcbdaab1f9d4f5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | qdoc: Add a test for validating output of QML basic type methodsTopi Reinio2020-02-183-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36585 Change-Id: Idbcc701394e1a1f688d3832a88ae5f8948e73c36 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-180-0/+0
| | |\ \ | | | |/ | | | | | | | | Change-Id: I97ae7b66018ed1b5b51ba8fa4d4f2284f1c5db26