summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add more into changes file of 5.14.1v5.14.15.14.1Jarek Kobus2020-01-171-0/+2
| | | | | Change-Id: Ieb1613a6241b3e2f82f8cfc5c665bc71d9cb2092 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge 5.14 into 5.14.1Kari Oikarinen2020-01-152-5/+1
|\ | | | | | | Change-Id: I56056dc6f61fd14277051be027e55e6365c4c2ac
| * Remove identical code under if for different branchesLevon Sargsyan2020-01-131-5/+1
| | | | | | | | | | | | | | Change-Id: I953f30dc04f4bc95fccb135b79f806d6a354ed70 Coverity-Id: 226101 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Update internal assistant documentationJarek Kobus2020-01-091-0/+0
| | | | | | | | | | | | Fixes: QTBUG-65810 Change-Id: I02fa147bed30342f12f26f6ba0169ef6d9f98e79 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Add changes file for Qt 5.14.1Antti Kokko2020-01-141-0/+24
|/ | | | | Change-Id: I7d7b9d800e360f008e9a9798fb5541b8ad3f6b07 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump copyright yearJani Heikkinen2020-01-086-12/+12
| | | | | Change-Id: I81c229523e0d896f25d6d961c9857b615218ecbb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Change test function positions to match their declaration orderLevon Sargsyan2020-01-061-24/+23
| | | | | Change-Id: I82bd549f93ce19b029c0e3c7220652e569ee07dc Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix empty content and index widgets when qhc is readonlyJarek Kobus2020-01-062-0/+2
| | | | | | Fixes: QTBUG-78146 Change-Id: I1e52e17d9024f566e761b804d56bf029f1d7b83f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* QDoc: clean up ctor/dtor in AtomPaul Wicking2020-01-063-18/+10
| | | | | | | | | | | * Make calling code specify Atom type, remove superfluous ctor. * Move default initialization from initialization list to in-class for member that initializes the same in all ctors. * Move initialization from ctor body to initialization list. * Mark trivial dtor default. Change-Id: I5e4a9e5cdcf0b9f3ba68b53dcab34c2ab77b415d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QDoc: Fix whitespace (again)Paul Wicking2020-01-061-5/+3
| | | | | | | | | Whitespace that got reintroduced from an old patch that integrated late. Fix it separately to avoid mixing with other changes. Change-Id: I6e905cd5710a31c671702a6ad9f5711b251e1020 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QDoc: Use html5 charset declarationPaul Wicking2020-01-0526-26/+26
| | | | | | | | | | | | As we claim the html is html5 compliant (<!doctype html>), use the html5 charset declaration instead of html 4.01 style. Also, drop the trailing '/' (no need to close meta element). Update all test content to match the new output. Task-number: QTBUG-73026 Change-Id: I4cf58a342a2bfb9e76245bd3fb91525e6e59f622 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* QDoc: Drop xml prolog from html outputPaul Wicking2020-01-0526-30/+0
| | | | | | | | | | The html output is not well-formed xml, so let's not claim that it is. Update expected output in tests to reflect the change in output. Task-number: QTBUG-73026 Change-Id: I0e6646eb33cafad7be543869585609d6f4cb0fdb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Fix regression in C++ functions sharing a documentation commentTopi Reinio2020-01-057-6/+37
| | | | | | | | | | | | | After a recent refactoring, the function that distributes c++ documentation nodes failed to do anything with a function node that was sharing a comment with other nodes. Fix the issue and add a testcase for shared c++ \fn documentation comments. Fixes: QTBUG-81005 Change-Id: I6320bab232671f8cd969a37136708fc172de8409 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add an autotest for QDoc's example manifest fileTopi Reinio2019-12-203-0/+35
| | | | | | | | Add a test that verifies the content of the examples-manifest.xml, with some metadata, and a QHP namespace defined. Change-Id: I91bc25ee10e1054c823ec1d14cccb6d9c6ca36d9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* windeployqt: Fix deployment of MinGW/release with debug infoFriedemann Kleint2019-12-191-11/+28
| | | | | | | | | | | | | | | | | Change the debug detection to match debug or release for anything except Msvc/ClangMsvc, effectively turning the check off. Msvc/ClangMsvc are the only remaining compilers for which distinct debug/release binaries are generated by debug-and-release due to the different runtimes. Fixes: QTBUG-80806 Task-number: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I85f170787c45a08cc28f37caa54e152dd7191e0f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Simplify the code printing the enum valuesThibaut Cuvelier2019-12-191-17/+9
| | | | | Change-Id: I743baf96185fcb20ce740fcc9c2beb011f5bdefb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add a comment about the replacement of some identifiers by subscriptsThibaut Cuvelier2019-12-191-6/+9
| | | | | | | Clean up some related code Change-Id: I5d8d853e63a0d6a219d659a83267c748bbe42342 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* windeployqt: Refactor platform enumerationFriedemann Kleint2019-12-195-50/+54
| | | | | | | | | | | | | | | | | - Make it a QFlags, providing operators - Remove WinCE - Add a Msvc compiler flag and make the tests for build directory and d-suffix depending on it. - Add clang-Msvc/clang-MinGW - Rename WindowsDesktop to WindowsDesktopMsvc, WinRtIntel to WinRtIntelMsvc and WinRtArm to WinRtArmMsvc - Use QFlags::testFlag() Task-number: QTBUG-80806 Task-number: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I0dd74a7b03e9e6bee55d4234c12eec17d52ce0e2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Fix debug detection of "_app" versions of MSVC runtimeOliver Wolff2019-12-191-0/+3
| | | | | | | | | | UWP targets have the naming scheme of VCRUNTIMEXXX(d)_APP.dll. The "_APP" part, which is also mentioned in the comment, has to be taken into account when looking for the d "suffix" of the runtime library. Change-Id: Iea84687c7c3f230ac9520ca983e742b0938eec15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jiong Chang <xspeed1989@gmail.com>
* qdoc: Introduce ignorewords configuration variableTopi Reinio2019-12-184-102/+113
| | | | | | | | | | | | | | | | | | QDoc automatically generates hyperlinks for words that qualify for auto-linking. This may become a problem whenever there is a qualified word as a section or a page title, and that word appear in the documentation frequently. For example, 'macOS' is mentioned often and each occurrence is linked, which is unnecessary and sometimes confusing. Provide a way to exclude specified words from being auto-linked. Create a new helper function, DocParser::isAutoLinkString(), to determine whether a string qualifies, and replace duplicated code with calls to that function. Fixes: QTBUG-79135 Change-Id: Ie53fe7ca0692f7b8e10a5f2208df5cd2ee2aab1d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* clang-format QDocPaul Wicking2019-12-1767-4629/+3911
| | | | | | | | | | | | | | | | This patch is the result of formatting all of QDoc's source with clang-format. The clang-format style is from the qt5 super repo's _clang-format definition. The purpose is unify the style across the code, to avoid spending too much time on style related issues in reviews and cleanup patches. Future changes to QDoc can benefit from using git-clang-format in combination with the git commit hook provided in qtrepotools.git as mentioned in this email to the dev list: https://lists.qt-project.org/pipermail/development/2019-October/037682.html Change-Id: I8af6a051c8334b5f35862a4dcd3becce8ac500c2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: I574e7de9c22ae8dae680cae643272d5e2933491a
* qdoc: Fix regression in output for QML properties with shared commentsTopi Reinio2019-12-1611-140/+195
| | | | | | | | | | | | | | | | | | QDoc was incorrectly assuming that QML properties that share a comment must belong to a property group. Fix the issue, reduce duplication of code with functions that output properties and methods, fix the 'id' attributes that were left empty, and remove the <a name="..."> elements that are obsolete and unnecessary now that 'id' has correct content. Add a test for both properties and methods that share a comment, and fix the expected output data for above changes. Fixes: QTBUG-80768 Change-Id: Iddfca8214b6058987c76cd8f8dd6a842ce7cea89 Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add binary compatibility files for qttools 5.14 branchMilla Pohjanheimo2019-12-163-0/+62061
| | | | | | | BC files built against 5.14.0 added. Change-Id: I460c304049a7794083f6b516530c0faf0b6fa2e8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Factor out the formatting of the "since" textThibaut Cuvelier2019-12-135-38/+27
| | | | | | Change-Id: I3ec3342eb3362664c605c4120238566d87c8b176 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+63
|\ | | | | | | Change-Id: Ic84336c38cc11cb5959c8ebd345c224fb1399a84
| * Add qdoc-specific changes to changes-5.14.0v5.14.0-rc2v5.14.05.14.0Topi Reinio2019-12-031-0/+10
| | | | | | | | | | Change-Id: Id38ada70cfe8316d37c5c329ddb727d67723f2ee Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Add changes file for Qt 5.14.0v5.14.0-rc1Antti Kokko2019-12-021-0/+53
| | | | | | | | | | Change-Id: I31ed95639792ffd2cc5bd00b07a39844df4ff010 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QDoc: Add tests to cover webXML generationPaul Wicking2019-12-1318-0/+384
| | | | | | | | | | | | | | | | | | | | This patch adds new tests and test data for covering webxml generation from plain qdoc, as well as from cpp and qml projects. Fixes: QTBUG-79003 Change-Id: I416e88cb4d0ee5c9a27c5096f4fd0d534a4ba50c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc tests: add convenience functionLevon Sargsyan2019-12-131-0/+8
| | | | | | | | | | | | | | | | Allow tests to remove full paths from strings to circumvent hard-coded paths in output. Change-Id: I4270f201649e9e5145b1ce75d2d372605a95579d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | windeployqt: Fix MinGW deploymentFriedemann Kleint2019-12-133-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | The platform no longer has a 'd' suffix for debug binaries (see qtbase/4d289edb14aeb4976218cc306bfc514e37521b82). Add a check. Fixes: QTBUG-80763 Task-number: QTBUG-78445 Change-Id: I8d4617e2111167a546fa172cbca78a656d233ee5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | QDoc: Minor cleanup in main.cppPaul Wicking2019-12-121-48/+42
| | | | | | | | | | | | | | Simple cleanup to improve readability. Change-Id: If9ee2947ad76e64d230584a3cb36e51457f643c3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Use QVector instead of QListPaul Wicking2019-12-1229-101/+102
| | | | | | | | | | | | | | | | | | | | | | Replace the use of QVector in most of QDoc. Also, remove one redundant C-style cast to int for result from method call that returns an int. As this happened in a macro, the result is removing a whole bunch of nagging from code inspection. Fixes: QTBUG-80669 Change-Id: Ib1aed95e01eaddd1e1213a145e815a0c4753ac67 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Make testAndCompare() take an output directory as parameterLevon Sargsyan2019-12-111-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces an extra parameter to testAndCompare(), that allows comparing expected vs actual in the provided output directory. This is necessary for further refactoring of the test, so each test point will use its own directory for its expected output. This will help to avoid name collisions. Change-Id: I6c539ac7e2ec9dae06d8f03ef30f1c218de50ac9 Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QDoc: Minor adjustment/cleanupPaul Wicking2019-12-117-59/+59
| | | | | | | | | | | | | | Pre-increment instead of post-increment for efficiency and readability. Change-Id: I10b33360dd36cd1d0f4338441c1ad4724551e80e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Get rid of unnecessary castsPaul Wicking2019-12-116-17/+17
| | | | | | | | | | | | | | Drop casting ints to int. Change-Id: I571f3e245bfc97a7c0c7bea5bedbf0ed5ab04c60 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Clean up whitespacePaul Wicking2019-12-113-19/+19
| | | | | | | | | | | | | | Fix minor whitespace issues accodring to style. Change-Id: Ie56e815f23f25ccb1b2ffb03780b9e4c6b9d25eb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Remove unused codePaul Wicking2019-12-111-10/+0
| | | | | | | | | | | | | | Delete commented out code. Change-Id: Iaa08fed365d5a4d6a2986908761ce42342089730 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Drop unnecessary sortPaul Wicking2019-12-111-2/+1
| | | | | | | | | | | | | | | | | | There's no change in output by not sorting the container, so it seems to be entirely unnecessary. Also const qualify the container that is no longer sorted. Change-Id: I8d5186a70623b8db6397eb88b9b0a9b53465a34a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Clean up loops with iteratorsPaul Wicking2019-12-1020-1018/+692
| | | | | | | | | | | | | | | | | | | | | | - Use ranged-based fors where applicable. - Use auto keyword for iterators. - Move a few variable declarations to where they're to be used. - Update docs where applicable. Fixes: QTBUG-80536 Change-Id: I859440b96428dec4ef108b01d391479d3f8dbd83 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: Get rid of out-parameterPaul Wicking2019-12-103-4/+5
| | | | | | | | | | Change-Id: Ifbd739510abd5bec4cc2b4fbac9b6667d9ae9281 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix wrong filename issue under windwows in webxml/index generationLevon Sargsyan2019-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The filename attribute section in the generated index/webxml has been taking redudant directory name under Windows platform. This patch fixes the issue by removing filename deduction code and replaces it with fileName() from QFileInfo class accordingly. Change-Id: If0ef2e88c94e837099fd5e669d2b7e96e7cd4280 Fixes: QTBUG-80641 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | QDoc: remove dead/unreachable code reported via coverityLevon Sargsyan2019-12-062-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes structuraly and logically dead code, reported via coverity scan and reported to appropriate categories of "dead code". Coverity-Id: 11018 Coverity-Id: 226101 Coverity-Id: 226127 Change-Id: I1930299c57ff10875c5b7e2df51895d9dee42fac Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io>
* | Improve QDoc autotest for QML documentationTopi Reinio2019-12-0622-5/+945
| | | | | | | | | | | | | | | | | | | | | | | | Fix the previous test that never generated any QML type documentation, and add new test types, documented in .cpp, .qdoc, and inline in .qml. Use all available \qml-specific QDoc commands. Fixes: QTBUG-80154 Change-Id: I60d9762836b986ca534c664517274517b73c085d Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix null pointer dereferencing coverity issues in qdocLevon Sargsyan2019-12-053-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes potential null pointer derefencing issues all over qdoc project that has been found via coverity scan and has been assigned to "Dereference after null check" category. Fix include coverity issues with REVERSE_NULL as well as FOWARD_NULL cases. Change-Id: Icb6f413ea7bbfae76f8e68139baa31b15575a49a Coverity-Id: 163245 Coverity-Id: 11133 Coverity-Id: 185270 Coverity-Id: 226086 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Remove "Node" header dependency from the "Generator"Levon Sargsyan2019-12-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change substitutes Node header dependency on Generator with forward-declaration. This doesn't break any functionality since the header of Generator references only Node pointers. Aim of such change is aligned with the strategy of breaking down any unnecessary dependencies in the code to make qdoc unit-testable. Change-Id: Ia2ef2f2fb62a1435bffeda1f1b389a3079ac12b0 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Add regression test for class name sortingLevon Sargsyan2019-12-0412-0/+219
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds a regression test to cover QTBUG-80259 by adding new test data to the existing end-2-end qdoc test suite. The test is covering class name sorting functionality during documentation generation. Change-Id: I6421981596f4d72e8b0ce8351e85a8e5b3856b45 Fixes: QTBUG-80456 Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QDoc: Minor cleanup in doc.cppPaul Wicking2019-12-041-1/+1
| | | | | | | | | | | | | | | | Improve readability by pre-incrementing instead of post-incrementing. This should also improve performance slightly. Change-Id: Icec66867dfdb04a65e3fe3229d21e2cda98eebb9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Adapt code to follow coding rulesThibaut Cuvelier2019-12-031-38/+27
| | | | | | | | | | | | Change-Id: I8e58dcecdc392c6fc26840f18d4b0e216941de27 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | qdoc: Restore alphabetical ordering of generated type listsTopi Reinio2019-12-031-45/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comparison function used for sorting compares fullTitle() strings for PageNode items. When the class hierarchy was refactored, this had the unintended effect where this comparison was applied to lists of C++ and QML types as well - the full title is empty for these, so we ended up comparing the physical location of the type declarations instead. Fix this by preferring the fullName() over fullTitle() when comparing, as the former is what the visible list item names are generated from. Make the comparison function easier to read and maintain by introducing a preprocessor macro. Fixes: QTBUG-80259 Change-Id: I3f35aa80f1a90a6817f836146976d73b857df820 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
View Lorry Controller Status