summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+24
|\ | | | | | | Change-Id: I7ba4e256a3dddcd3df7e041659a41cff39bc78dd
| * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-161-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 447f33743c3e07d645831f07b821ad76a203fd6f QDoc: Let configure accept libclang built from git sources + b693122a4e08e5745d1b288ef7e1525b085c1ebd qdoc: Fix regression in QML types inheriting property groups + 4f8bb92f9654efd6cc5dc7c6b08979fe3106b3ea qdoc: Sort the members of shared comment node collective + 5eae325fcb4140155fe97ee0dff6101e4a2db444 QMake: fix GCC 9 -Wdeprecated-copy warnings + cd50765264adac52dc7ace48b0f339c0b13f76fc qdoc: Allow per-example override of install path + 653884ab6988ea72fc0d5cc21675efcef67d0455 qdoc: Override isObsolete() for a FunctionNode + 01dbe9a348f09cfefc927d1de96d82afbd09f995 qdoc: Do not sort nodes based on their address + 1639c9a80490fc56c2bb1438dfa0d84455be55ed QDoc: Move logging to helper method + a3d82bec9678fda3d8c8b7766e83267142d1ef4a Bump version + cd352d921fc2f523f8d83d387d51390305e71d89 Doc: Remove references to 4.x in QDoc manual + 559332dc3efa507baaaba4ea8288bdb2318bc73d qdoc: Fix regression in linking to QML properties in offline docs + 26daab2554a55243a0cb6744346e1cfb27cfc3a9 QDoc: Remove Location::null + c555d3493f52c378707a40d824d70f369e0b4db9 qdoc: Extend \include command to include exampledirs + 698ffa215fd3fd7b8dd67ed9be88ca1a6731df91 windeployqt: Use correct file name for ANGLE + ce895f066579f71d87c3b46361e291ad7734e88e QDoc: Fix handling of -F option Change-Id: I9704f2e8778288bd01915cd2fd4a4ace93285496 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Add note about the llvm installer on WindowsJoerg Bornemann2020-04-151-0/+4
| | | | | | | | | | | | | | | | | | Note that one has to restart their build shell after installing llvm with the pre-built installer on Windows. Task-number: QTBUG-83429 Change-Id: Ife15ba8179bb53930315f597f05c09bd1a12cbeb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Just link against the qsqlite plugin when statically linkingAndy Shaw2020-03-101-0/+1
|/ | | | | Change-Id: Ia150b72a064e39bc25cca774a337b44d9127c1e0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QDoc: Fix handling of -isystem optionDmitry Shachnev2020-03-041-0/+3
| | | | | | | | | | | When qdoc is built with QDOC_PASS_ISYSTEM define, it is possible to pass -isystem options to qdoc, and it will forward them to clang. Commit ce895f066579f71d fixed handling of the -F option, this commit fixes the -isystem option in a similar way. Change-Id: I876546650354ca3ee7f6edd216fd38b3d1a17285 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QDoc: Fix handling of -F optionEike Ziller2020-02-271-17/+21
| | | | | | | | | | | | | Even though it was documented to use -F to pass framework paths to QDoc (macOS), that was not working and instead passing "-I-Fthe_path_that_was_specified" to Clang. [ChangeLog][qdoc] Fixed "-F" option on macOS Task-number: QTBUG-82252 Change-Id: Ib85e3affad5487e428a8eccf0c239b437c75b759 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* 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>
* qdoc: Extend \include command to include exampledirsVenugopal Shivashankar2020-02-1427-10/+1177
| | | | | | | | | | | | | By default, qdoc supports \include files from the sourcedirs only. It should also consider files to \include from the exampledirs, like it does for the \snippet and \quotefromfile commands. In addition, added a test to check if the \include works for files exampledirs. Change-Id: I9ce0b1905bfd0413022a4b4cab42588e4540e70e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QDoc: Remove Location::nullPaul Wicking2020-02-128-26/+22
| | | | | | | | | As Location is not a CoW class, the use of Location::null over Location() seems unfounded. Remove the static null object and replace its use. Change-Id: I27dd4dfabffbfedb4f310dac43614e1ebb03c522 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qdoc: Fix regression in linking to QML properties in offline docsTopi Reinio2020-02-128-32/+34
| | | | | | | | | | | | The <a name="..."> elements used for anchors are obsolete, but it turns out the QTextBrowser backend for offline documentation still relies on them. Re-introduce them into the output. This commit partially reverts 5aa19d92. Fixes: QTBUG-82034 Change-Id: Ia4af9c2ed809b12c5f79d27db4dd3eb5e9523d13 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Remove references to 4.x in QDoc manualPaul Wicking2020-02-123-25/+17
| | | | | | Fixes: QTBUG-48218 Change-Id: Iedbb20225d41cfd3213b8b7a1737da41b4e64561 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I9c139ec10969ed15ab3eed71be0943b7250dc791
* QDoc: Move logging to helper methodPaul Wicking2020-01-301-13/+24
| | | | | Change-Id: I39d10454442178e6f1292d136eea8ee990ad162f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qdoc: Do not sort nodes based on their addressTopi Reinio2020-01-291-1/+1
| | | | | | | | | | | | | QDoc generated different output for two consecutive runs because we were sorting nodes based on the addresses of node pointers. Use the existing comparison function for sorting nodes. This makes QDoc's output deterministic. Fixes: QTBUG-81712 Change-Id: I5e80c82d7582d76c4a3ac1e656f8480159d35240 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io>
* qdoc: Override isObsolete() for a FunctionNodeTopi Reinio2020-01-293-17/+19
| | | | | | | | | | | | | Make Node::isObsolete() virtual and override it for FunctionNode. This is needed to treat access functions of obsolete properties also as obsolete. Remove FunctionNode::hasActiveAssociatedProperty() as it was a workaround for isObsolete() not being complete for function nodes. Fixes: QTBUG-79386 Change-Id: If7597ca19f35b4582979bed36f628874c5beac07 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Allow per-example override of install pathTopi Reinio2020-01-2910-15/+85
| | | | | | | | | | | | | | | | | The 'examplesinstallpath' configuration variable assumes that all examples - once installed - are located under a common root path. Add a parameter 'installpath', recognized by the \meta command, which can be used for setting the install path for specified examples. Improve the test for examples-manifest.xml to cover the \meta command usage. Task-number: QTBUG-81360 Change-Id: Ibb525a48958005fb3a589ef2d9d212091829231f Reviewed-by: Levon Sargsyan <levon.sargsyan@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QMake: fix GCC 9 -Wdeprecated-copy warningsThiago Macieira2020-01-282-1/+1
| | | | | | | | Cherry-pick of efa183309e69f317189ef06fb1f13b60da9d7c63. Looks like it was never cherry-picked as intended. Change-Id: Iad959315ad374ef288f5fffd15d684efbcdc6197 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+26
|\ | | | | | | Change-Id: Ib1f2c2fe9e5ebcb8e37fea3b73a7127fa937484b
| * 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
| * | Add changes file for Qt 5.14.1Antti Kokko2020-01-141-0/+24
| | | | | | | | | | | | | | | Change-Id: I7d7b9d800e360f008e9a9798fb5541b8ad3f6b07 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | qdoc: Sort the members of shared comment node collectiveTopi Reinio2020-01-244-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Nodes sharing a comment will be listed together as a group, so sort them alphabetically. Fixes: QTBUG-81265 Change-Id: Ia8dcba92d74116bf6757bfc9aaded1c65d7271fd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | qdoc: Fix regression in QML types inheriting property groupsTopi Reinio2020-01-245-31/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property groups from base types were not listed on 'All Members' pages of a QML type. This was because we skipped all shared comment nodes for base types; property group is a special type of SCN. Remove duplication in the code that distributes the nodes; this ensures that there is no difference in output between members of a type and members inherited from its base types. Use logging category to display debug warnings instead of qDebug(). Add a test to cover this. Fixes: QTBUG-81262 Change-Id: I46c3e6afa87c510a7929088acbd1fb354f6733af Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | QDoc: Let configure accept libclang built from git sourcesPaul Wicking2020-01-211-4/+4
| |/ |/| | | | | | | | | | | | | Add "git" as allowed optional version string suffix. Fixes: QTBUG-81534 Change-Id: Ia83d924f4e16045b464e94954b544d3d2c111523 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | 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>
* 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>