summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Clean-up some codeThibaut Cuvelier2019-11-181-9/+9
| | | | | Change-Id: I1b5d0d96c8955852369ecc8717b020335f05c010 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add missing spacesThibaut Cuvelier2019-11-181-4/+4
| | | | | Change-Id: I044702411c8aba3286c98d42962a4d19720e33fb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Change documentation as proposed by Edward WelbourneThibaut Cuvelier2019-11-181-3/+4
| | | | | Change-Id: Ida9040a17e05b193974d39d72a9998c0a63ed892 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Allow a documentation project to load all available index filesTopi Reinio2019-11-141-3/+9
| | | | | | | | | | | | | | | QDoc recognized '*' as a valid input for the 'depends' qdocconf variable, with the intent to load all available index files. This did not work as we cleared the resolved dependencies by re-fetching the depends string from Config after resolving the dependencies. This fix is a backport of another commit that is targeted for the dev branch, but this useful already for 5.14. Fixes: QTBUG-80051 Change-Id: I1d752208078452f4b16b1d855cdb67b8cbabf1f4 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Ignore the 'enum' keyword when parsing a Q_PROPERTY typeTopi Reinio2019-11-141-0/+2
| | | | | | | | | | | | | | | QDoc's parsing of property types is slightly naive, in that it cannot parse a type that consists of multiple words. These are not common, but we do have a few instances of Q_PROPERTY(enum EnumName ...) in the Qt source. This commit allows QDoc to parse above properties by ignoring the string 'enum'. Fixes: QTBUG-80027 Change-Id: I3b01d463b081042dd27299c2121fafa3c99b98ce Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Change spaces to follow coding rulesThibaut Cuvelier2019-11-1313-50/+50
| | | | | Change-Id: I81de861e9daa00249c47ddbe259f43f47d7c6615 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Resolve documentation warningsTopi Reinio2019-11-118-16/+11
| | | | | | | | | | | | | - QDoc Manual: UIComponents example project has been moved to be a part of test case - remove references to it from the manual. - Add missing image. - Document the namespace qdesigner_internal as \internal. Fixes: QTBUG-79833 Change-Id: Ic0984cef4091e794de5e502d04a897b1f532d9d8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: WebXML output: Reuse code to generate annotated listVenugopal Shivashankar2019-11-112-18/+15
| | | | | | | | | | | The inline and auto links were handled differently compared to the members list for a group page. This change reuses the same code for generating any kind of link. This change amends 8f5ebc02f6653e Change-Id: Ic9d2bf00a95c718d6074ec2b0b4705324cccf053 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: WebXML output: Fix the annotated list table for groupsVenugopal Shivashankar2019-11-061-2/+6
| | | | | | | | Each <row> should have <item>s representing the columns that contain <para>. Change-Id: I264f490a3809e9f0776dc3aa2a3c25b783c0fd6b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta3Liang Qi2019-11-052-3/+3
|\
| * Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-11-052-3/+3
| |\ | | | | | | | | | Change-Id: Id9060f7bd9103d8f9e29f71d397f3615ead183dc
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-301-2/+2
| | |\ | | | | | | | | | | | | Change-Id: Ic8cb8f2dd90f8fb809034ef07b341f3f7cb71ab2
| | | * Merge 5.13 into 5.13.2Frederik Gladhorn2019-10-112-7/+9
| | | |\ | | | | | | | | | | | | | | | Change-Id: I5355c7537c1f4dc5bbf80e52e3c0c28282fd4446
| | | * | qdoc: Do not add class to map if isDontDocument() is trueMartin Smith2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update ensures that if a class node returns true for isDontDocument(), it is not included in the map used for generating the all classes list. This also applies to QML types. Task-number: QTBUG-78940 Change-Id: I020cb0dd2f16187d5f6c75b400778b1518d7e05a Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
| | | * | qdoc: Remove multiple QTypeInfo entries from All Classes pageMartin Smith2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTypeInfo is a class that is generated by a Qt macro. It is not documented and is not supposed to be documented, but clang sees it as being in the public API. This update ensures that the class is marked internal prior to generating the index file. Ironically, this was one of the classes that motivated the addition of the \dontdocument command, and it was the test for isDontDocument() that caused this bug. We might have to visit the \dontdocument command again. Task-number: QTBUG-79088 Change-Id: I11307a2236e2ebcdcc205952056ddaca88fc0bd3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | | Correct a few typos in qdocThibaut Cuvelier2019-10-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b9a66f15308ecbbdbeaf2dc66de3875b16dd03f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | | windeployqt: Do not patch Qt5Core.dll unless necessaryFriedemann Kleint2019-11-051-7/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the content is already is patched to avoid unnecessarily touching files. Fixes: QTBUG-78732 Change-Id: I061927e8908793b78211b4634c3dc772c12c7915 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | QAbstractFormBuilder::save(): Add a note explaining property issuesFriedemann Kleint2019-10-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State that the resulting files are not intended to be used without editing. Change-Id: I5ae342907a9394427ef9d3471ff2670421da8cc0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com>
* | | | pixeltool: Show color under mouse in the window titleAlessandro Portale2019-10-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Hint which color will be picked when pressing 'c'. Change-Id: If48392b288732b30d88bff18b3a3bbf5074947ed Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | pixeltool: Add context menu option to copy the colorFriedemann Kleint2019-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to copy the color via QColor::name(), bound to the 'c' key. Change-Id: Ib33538e5ea5523e5ec5881d75e0b17ab675078e3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | | pixeltool: Pick color under cursor also outside of the pixeltool windowAlessandro Portale2019-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to pick color directly from the whole screen Change-Id: Ifc845b1303203db54c657dac6fa02ba841b97fcc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | pixeltool: Small cleanupFriedemann Kleint2019-10-222-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use member initialization - Change m_currentColor from int to QRgb, fixing signedness warnings - Use QT_CONFIG Change-Id: I4181e0bc913e29788844c2dc8d47daf3c69e3ce8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | | qdoc: Fix MSVC warnings about '*/' found outside of commentFriedemann Kleint2019-10-211-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add space, fixing: qttools\src\qdoc\codemarker.h(52): warning C4138: '*/' found outside of comment qttools\src\qdoc\codemarker.h(54): warning C4138: '*/' found outside of comment qttools\src\qdoc\codemarker.h(55): warning C4138: '*/' found outside of comment ... Change-Id: I1b53fadc09f47146738fe9e8c444ba874f048a97 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | QDoc: Do not generate self-referencing links for methodsPaul Wicking2019-10-211-2/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I966a4633e1d572f04fcd2113b5f1ce4b9e083183 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into 5.14Paul Wicking2019-10-201-3/+9
|\| | | | | | | | | | | | | | | Change-Id: I740be88a123913bd2a5146c7402609addf9051b0
| * | | qdoc: Remove shared comment nodes from all members pageTopi Reinio2019-10-151-6/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Shared comment nodes ended up in the 'all members' list for a type. These showed up as empty list items in those pages. Fixes: QTBUG-79065 Change-Id: Ia9040e051ef9454b38a04c816c3d8f74302478a4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Qt Designer: Adapt signal slot editor column widthsv5.14.0-beta2Friedemann Kleint2019-10-172-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Resize the columns when adding new connections (with potentially long object names) or when loading a form. Fixes: QTBUG-79266 Change-Id: I47e8fe8e8139e5326e07aece5e0f2406ac6117e6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | qdoc: Fix issues with shared comment nodesTopi Reinio2019-10-166-67/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc stores <sharedcomment> elements to the .index correctly, but the nodes that were sharing a comment were added after the shared comment. This meant that a shared comment node (SCN) could not find any of its members as they hadn't been read in yet. Fix this by delaying the creation of a new SCN until we have a list of sharing nodes. Also fix other related issues: - Generate content also for non-function SCN members. - Make SCN adopt the genus of a member when adding one. - Fix Node::isPropertyGroup() to return true for actual property groups (not all QML properties that share a comment) and fix usage of that method. - Fix linking to property groups when searching by the group name. - Restore indentation of property group members both in the summary section and in the All Members file. Fixes: QTBUG-79204 Change-Id: I1702f39b178f52444436b800d4fe9cb99f976a60 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: Don't Auto-Link references to selfMartin Smith2019-10-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This update prevents C++ class names and QML type names from becoming auto-links on their own page. Task-number: QTBUG-79201 Change-Id: Id0763da375fa31bfa3c261b9dab9d2b7b11934b1 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Qt Designer: Fix updating of object names in the signal/slot editorFriedemann Kleint2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix invalid indexes emitted in update signal. Fixes: QTBUG-79267 Change-Id: I5c99d8102d9be0e5296364697e85ee55f49147d9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | qdoc: Fix warnings about un-annotated fallthrough and missing breakFriedemann Kleint2019-10-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Amends 3f3cf9dd93bfcb6c8989afa45f391633d007c8ce. Task-number: PYSIDE-1088 Change-Id: Iba37b69f84c6024d7bfd33f6020938b04e07240f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | QDoc: Remove QDocGlobalsPaul Wicking2019-10-146-434/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the setting of configuration options from QDocGlobals to Config. This allows for the removal of the entire QDocGlobals class. Some methods (getters/setters) are part of the move, others were used exclusively by Config:: and are therefore dropped entirely. Also, move the ownership of QDocCommandLineParser from main() to Config - this makes Config the authoritative source of all settings, whether from the command line or .qdocconf variables, and makes it possible to reset() the full state of the Config. Finally, remove the QDocGlobals auto-test, as it is no longer needed. Change-Id: I8e39931c828c763cb0462cbbdf3fe1a39b2ad70b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | qdoc: Warn when writing QML import statement with incomplete informationTopi Reinio2019-10-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The module import info for a QML type is provided by the QML module node, and the QML type documentation must include the \inqmlmodule command, unless QDoc was able to resolve it based on the 'project' name. Change-Id: I4bb3365c83de042597fb0b799329c814b9da5d3f Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-102-7/+9
|\| | | | | | | | | | | Change-Id: Ie3479c5a11d47037aec18fca65779fc5b7356e82
| * | Fix code snippet in qdoc manualPaul Wicking2019-10-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Id62ceaac5a34b165026ee81fa504dedaa0ecb1bd Reviewed-by: Martin Smith <martin.smith@qt.io>
| * | Fix build with -no-feature-tooltipJoerg Bornemann2019-10-091-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-79048 Change-Id: Ie6493f923089b95ca7617a9485b466b55a6f0b73 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Doc: Minor corrections qdoc manualNico Vertriest2019-10-071-4/+4
| |/ | | | | | | | | | | Task-number: QTBUG-78936 Change-Id: I9219581857e83daaae35a717a4d9cdf8f3c4a6aa Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QDoc: Minor clean-up in main.cppPaul Wicking2019-10-101-2/+3
| | | | | | | | | | | | | | | | | | - Reserve memory for container - Use range-based for loop Change-Id: Ia37e4ab1d14b4243ea40dca147acffdd86d021ca Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-051-0/+18
|\| | | | | | | Change-Id: Ic309dd67a41f98e020a0b6e432c692188a6b1183
| * Doc: Add doc for the \dontdocument commandNico Vertriest2019-10-021-0/+18
| | | | | | | | | | | | Task-number: QTBUG-78936 Change-Id: Ia8635aa1b2d2ce97e5c1390bcdd7a5c920d87e83 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | QDoc: minor cleanup in Generator and NodePaul Wicking2019-10-033-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator: * Don't sort container of QMap's keys as they're already sorted. The container can thus be made const. Node: * Make getter const * Remove qAsConst used in a ranged for loop in a const method. Both: * Remove qAsConst rendered superfluous. Change-Id: I8f65f87c0ed372573cdd17f96e95cd2732effdd7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Qt Designer: Fix potential BC breakv5.14.0-beta1Friedemann Kleint2019-10-021-1/+1
| | | | | | | | | | | | | | | | | | 96b70c3a3e269c671f6ecae9c81a0cf7aad1f325 changed Q_DISABLE_COPY to Q_DISABLE_COPY_MOVE in the public header QDesignerNewFormWidgetInterface. Revert this part. Change-Id: Ia978597b0752e99cb0fc3f8f3091c1d7dbc1b769 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Revert "Add empty clangcpp parser functionality"Lucie Gérard2019-10-014-124/+2
| | | | | | | | | | | | | | | | | | The functionality got moved to dev. This reverts commit a79eaba195f3b235b4c8db79caa75e42b38664a8. Task-number: QTBUG-78875 Change-Id: Iaccdfb9fe2e6a56eba9baf3d44961382834139eb Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QDoc: Minor cleanup in generator.cppPaul Wicking2019-10-011-5/+5
| | | | | | | | | | | | | | | | | | | | Fix 0 as nullptr constant. Stop using C-style casts: - Do not cast to int that which returns an int (QString::length()) - Use static_cast<>() where it's sensible to do so. Change-Id: I48c7a3e6f1465759dd3973eff66656a4f2a1c19a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | QDoc: Use range-based for instead of foreachPaul Wicking2019-09-2821-352/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change replaces the use of foreach with range-based for throughout QDoc. It also ensures that the loop body doesn't modify the container being iterated over, by: - Making a const copy when the container is a member variable or the result of an expression, and iterating over that copy. This is the preferred approach. - Using qAsConst() when the container is a (static) member variable or local to the method and not const. The latter is typical where the collection is sorted immediately before the loop. In two cases (doc.cpp), replaced Q_FOREACH + delete with qDeleteAll. In two cases (cppcodeparser.cpp), the range declaration is replaced within the loop statement. These rewrites express the behavior clearer than the original code. In two cases (codeparser.cpp), use a range-based for instead of a while loop where the condition is an iterator, for more expressive code. Finally, use the auto keyword where appropriate and improve a few variable names. QDoc warning count and generated output is unchanged after this refactoring. Change-Id: I64f02d24dca373a3a41402d535382e2c526bb55e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | QDoc: Fix some more whitespacePaul Wicking2019-09-271-2/+2
| | | | | | | | | | Change-Id: I0d95efceff54a8b7f54ed5e79275f9de1a43b68b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | QDoc: Remove unused code in generator.cppPaul Wicking2019-09-271-2/+0
| | | | | | | | | | | | Change-Id: Ib3e66cc21ba5f96b5e8b35d6021d643317bd961d Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-2712-108/+301
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-2712-108/+301
| |\| | | | | | | | | | Change-Id: I5c06b3e0177fcccd988620ab269f75632689a54c
| | * qdoc: WebXML output: Fix output for \group and \annotatedlistTopi Reinio2019-09-262-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WebXMLGenerator did not handle atoms of type AnnotatedList. Adding this enables listing of grouped pages with the \annotatedlist command. Similarly, empty output page was generated for the \group page itself. This was because QDocIndexFiles::generateIndexSections() only handled groups when processing the root node, which we must skip in this generator. Add explicit handling for group nodes, enabling us to receive callbacks from QDocIndexFiles to add content for these pages. Task-number: PYSIDE-1088 Change-Id: Id72d589a51fc7aae21ad5cdbb3c1dfa78d4c23ae Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:56:59 +0000