summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Teach QDoc to output function and class template parametersTopi Reinio2020-01-206-44/+114
| | | | | | | | | | | | | | | | | | | Add a visitor functor that reconstructs template parameters from the Clang AST, and use it when either a class or a method template is detected. Store this information in the node - for now, they are used only in the class reference page subtitle (for classes), and detailed section of function documentation. Template parameters are not considered when searching/linking to entities, they are for display only. [ChangeLog][qdoc] Added capability to display class/method template parameters in the generated documentation. Fixes: QTBUG-17456 Change-Id: I300cc63b9fa20d4f6efaeaa27ea3769635a7b32c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Improve formatting of subtitles on class reference pagesTopi Reinio2020-01-202-6/+11
| | | | | | | | | Remove useless parentheses, useless </br>, and link to each entity in the qualified (full) name. Fixes: QTBUG-81526 Change-Id: I419bd22c1159d71f796806ce8659c232d406b123 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix typos in QDoc ManualTopi Reinio2020-01-151-2/+2
| | | | | | | | Recent commits introduced two typos that caused a number of documentation warnings. Change-Id: I4ad32f96624c7204b4f721f4a3bc1d17ca53492d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-148-17/+13
|\ | | | | | | Change-Id: Ie6dc6946f0cf21c2cf57643c393e61b2deefb90d
| * 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>
* | qdoc: Introduce locationinfo configuration variableTopi Reinio2020-01-136-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simple boolean variable determines whether the full path information of entities is stored into index files, and by extension, the output of the WebXML generator. The default value is true, and QDoc's output is unchanged. Using a value of false is useful for testing QDoc; we can omit system build paths in the output as those complicated the comparison of expected and generated data. [ChangeLog][qdoc] Introduced a configuration variable to drop host-specific paths from the generated output. Fixes: QTBUG-81091 Change-Id: Ic8df5e4a52a12821e2858a185c4e658905deb847 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Introduce ignoresince configuration variableTopi Reinio2020-01-134-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt has a long history, with lots of classes and functions documented being introduced in a specific version. This \since information for decade-old features is not relevant anymore, producing noise about ancient Qt releases that have been long unsupported. In preparation for Qt 6, introduce a feature where we can set a cutoff value for \since information that can be ignored in the generated documentation. Fixes: QTBUG-81090 Change-Id: Ib35a2a4d8bc3a6cb9719223a45b02f0e63f337ea Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | qdoc: Make Config a singletonTopi Reinio2020-01-1331-128/+130
| | | | | | | | | | | | | | | | | | | | | | | | There is no need to pass a pointer to Config throughout the API; the only instance of it is created in main() so we can turn it into a singleton. Having access to Config without API changes makes implementation of configurable features easier. Change-Id: Ida47e067865082dfe036a7a97f7f1ffc736db346 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-105-14/+14
| | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I62145c2ecb97a5f3538502303fbdb81ad33aded7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Remove two potential instances of help engine before exec()Jarek Kobus2020-01-091-72/+90
| | | | | | | | | | | | Change-Id: I74c016fdfbe9d6fad13cad5819a38a4ffd3f16c5 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Assistant: Remove unused stuffJarek Kobus2020-01-0911-495/+0
| | | | | | | | | | Change-Id: I89134948df20e0b546ca6ef835da4a678fd579b2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Assistant: Use the refactored stuff in the AssistantJarek Kobus2020-01-095-612/+79
| | | | | | | | | | Change-Id: I69fd2e98079b172e8649697c8fd56064867be9fd Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Assistant: extract doc settings/widget in separate classesJarek Kobus2020-01-098-0/+674
| | | | | | | | | | Change-Id: I6eb8545a069febd578604207ae6f4f9311bb9aec Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | QtHelp: Add filter settings struct and editor for itJarek Kobus2020-01-0916-2/+1344
| | | | | | | | | | | | | | | | | | | | | | | | Adds the QHelpFilterSettings class, describing all the available filter details. Adds the QHelpFilterSettingsWidget class, serving as an editor for all available filter. It also provides methods for storing and retrieving filter details into / from the help settings. Change-Id: Ie87578fc30d8114b95508f5b761e7914447c247a Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Stop using SAX classesSona Kurazyan2020-01-088-164/+323
| | | | | | | | | | | | | | | | | | | | | | | | SAX classes for parsing XML documents will be deprecated soon. Re-implemented SAX-based xml parsing classes using QXmlStreamReader. All the parsers now inherit from XmlParser, which drives the parsing loop and allows overriding the methods for handling different XML tokens in a specific way depending on the use-case. Task-number: QTBUG-76177 Change-Id: I5393cc7218beffb4e48187e435c89d1d179deb37 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Qt Designer/Palette Editor: Set preview palette on QMdiSubWindowFriedemann Kleint2020-01-081-1/+1
| | | | | | | | | | | | | | | | Ensure the highlight color (which affects the subwindow border) has a visible effect. Change-Id: Ic4a3e9295aa85fb248546714fd29f02eca2ce2a5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Qt Designer/Palette Editor: Improve the Preview WidgetFriedemann Kleint2020-01-082-149/+270
| | | | | | | | | | | | | | | | Add more widgets. Most importantly, add an item view with alternate colors to be able to view selection colors. Change-Id: I263ad4b5109e42b3e839892af5fd8d8d7066ca30 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2020-01-077-33/+18
|\ \
| * \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-077-33/+18
| |\ \ | | |/ | | | | | | Change-Id: Iedc2f057fbc2c78a0ed11661dbe9141a542f0de1
| | * 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-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-5/+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-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 RHI info to qtdiagEirik Aavitsland2020-01-073-2/+113
|/ / | | | | | | | | | | | | | | | | Add some rudimentary output about available RHI backends. Task-number: QTBUG-78684 Change-Id: I1289c6f67affca33691e1ef701af106e0d494d9a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Implement DocBook support for qdocThibaut Cuvelier2020-01-0314-16/+4396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of this code would be to overhaul the translation project of the documentation in French, for Developpez.com (which is now stuck at Qt 4.7 due to outdated tools: https://qt.developpez.com/doc/). This means that this code will be used and maintained, whatever the decision follows QTBUG-71493, for instance. The DocBook support is not 100% vanilla DocBook, as some tags are missing, but rather an extension (which could be officialised soon: https://github.com/docbook/docbook/issues/111). These tags are used to encode metadata about the code being commented (classes, fields, functions, etc.). More precisely, the required tags are: [enum|macro|namespace|typedef|union][|name|synopsis], enum[value|identifier|item], [specialized]template[id]. These extensions can be enabled by the docbook-extensions parameter. If you want to see the history: https://github.com/dourouc05/qttools/tree/dourouc05-qdoc-docbook Change-Id: I919976d8680b41c5ca69bdb79a0b824c29b89d05 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | distancefieldgenerator: Fix deprecation warningFriedemann Kleint2020-01-021-1/+1
| | | | | | | | | | | | | | | | | | Use insert() for m_glyphsPerUnicodeRange, which is a QMultiHash, fixing: distancefieldmodel.cpp:186:59: warning: 'QHash<K, V>::iterator QHash<K, V>::insertMulti(const Key&, const T&) [with Key = DistanceFieldModel::UnicodeRange; T = unsigned int]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: I58488754c67af3c31574a4b657660ac094b188ec Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-2811-185/+215
|\ \ | |/ | | | | Change-Id: I8d517708261431bb0cc5b88030756af989da6bd0
| * 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>
* | rcc.cpp: Use a QMultiHash explicitly if insertMulti() is being usedFriedemann Kleint2019-12-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | Apply the rcc part from qtbase/c7e35ffe69a73bb144618714313673f0d0c28394 to the copy of the rcc code used in Qt Designer, fixing: shared/rcc.cpp: In member function 'bool RCCResourceLibrary::addFile(const QString&, const RCCFileInfo&)': shared/rcc.cpp:605:47: warning: 'QHash<K, V>::iterator QHash<K, V>::insertMulti(const Key&, const T&) [with Key = QString; T = RCCFileInfo*]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ib9989db852a8e0333d508c055c9f2667d65d74e9 Reviewed-by: hjk <hjk@qt.io>
* | Fix Qt6 buildAlexandru Croitor2019-12-194-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some unprefied textstream usages. Bump the module version to 6.0.0. Also windeployqt auto test is temporarily blacklisted because with the current situation it's not possible to make it pass both with a 5.x and a 6.x Qt build, and thus this would prevent a qt5.git integration. Change-Id: If750cf4f50ba4215cb63b53c42971f3d1f1c8160 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit f3d047af903801d9e7705816df5299c4e04a76f4) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix Qt6 buildAlexandru Croitor2019-12-197-10/+10
| | | | | | | | | | | | | | | | | | Change-Id: Ie413ca2e2f81ac0e92628ffd2f3e93047a91bd0c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 6b2f32f3dc9de965801927a4bc5d970028a318a6) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Paul Wicking2019-12-1867-4676/+3945
|\ \ | |/ | | | | Change-Id: I9ca43519bcad38f38f70eede4ee98b8028528259
| * 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>
| * qdoc: Fix regression in output for QML properties with shared commentsTopi Reinio2019-12-161-51/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-1445-1330/+967
|\ \ | |/ | | | | Change-Id: Iba365dc87ee3e96b2a44dad6bf4da436fd7b04f7
| * Factor out the formatting of the "since" textThibaut Cuvelier2019-12-133-35/+24
| | | | | | | | | | | | Change-Id: I3ec3342eb3362664c605c4120238566d87c8b176 Reviewed-by: Paul Wicking <paul.wicking@qt.io> 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>
| * 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>
View Lorry Controller Status