summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Allow QML/JS types with the same name as the parent modulev5.13.0-beta3Topi Reinio2019-04-161-2/+2
| | | | | | | | | | | | | QtMultimedia QML module contains a QML type QtMultimedia. QDoc was overriding one with the other because the search function returns both types of nodes (as they have the same genus, 'QML'). Fix this by checking that we actually found an existing type, not a module. Task-number: QTBUG-75186 Change-Id: Id7a151d6db137fd337e4dd68ebe7c8aa08ed80e0 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Pixeltool: Fix some subpixel mode pitfallsAlessandro Portale2019-04-111-3/+3
| | | | | | | | | | | Switching to one of the subpixel modes while having a zoomfactor below 3 made increasing the zoom (via context menu) impossible. Also, increasing/decreasing the zoom level via +/- keys did not happen in steps by 3 like when increasing/decreasing via context menu. Change-Id: Ibf69bc6247c74b960614b99df81a227ca57f5d5f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* qdoc: Allow replacing file lists on \example pages with a link to a URLv5.13.0-beta2Topi Reinio2019-04-094-10/+114
| | | | | | | | | | | | | | | | | | Source and image file lists that are automatically generated at the end of example pages have outlived their usefulness, at least for Qt docs. When browsing example documentation offline via Qt Creator's Help, the user has typically already opened the example project. For online documentation, a better option is to link to a remote repository where the user can browse the example's content. This commit adds a new configuration variable 'url.examples' - if defined, file listings are omitted and a link is constructed for each example based on the parameter passed to the \example command and the 'examplesinstallpath' configuration variable. Task-number: QTBUG-74391 Change-Id: If1f76ee34c5e50236fae626f251e00bf24c1045d Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Allow namespace members to use \relatesMartin Smith2019-04-081-1/+2
| | | | | | | | | | It had been required that \relates could only be used to relate global entities to a class. This change allows \relates to be used in the comments of entities in a named namespace. There are several cases in qtextstream.cpp Change-Id: I17b61dbdaf6b6bd8c420a2fa1fd9deef6b7125dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* qdoc: Turn off clang errors in PCH build without include pathsMartin Smith2019-04-082-4/+19
| | | | | | | | | | | | | | | | When the build system can't pass qdoc the include paths to qdoc, qdoc tries to guess reasonable include paths. There has been one case running qdoc on macOS for the QtPlatformHeaders module, where qdoc must try to guess the include paths. The guessed paths are not sufficient, and clang prints a large number of errors caused by missing stuff. This change tells clang not to report errors during the PCH build if qdoc had to guess the include paths. qdoc reports in its log that it guessed the include paths and that it turned off the clang error reporting. Change-Id: I91a4242dcc7d3017d511d969621cc3d673c47963 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Don't report override error when reimp is usedMartin Smith2019-04-053-5/+16
| | | | | | | | | | qdoc was reporting an error when the reimplementation of a virtual function that was documented in the base class was given a qdoc comment in the derived class that only contained the \reimp command. When the reimp command is used, the error should not be reported. This change implements that. Change-Id: I6905e35b4e9c3df12617446c04eb9ea6d1804832 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Add missing override keywordsMartin Smith2019-04-032-2/+2
| | | | | | | | | qdoc redeclares two virtual functions from the QML parser in qtdeclarative. These declarations were missing the override keyword, so this update adds it. Change-Id: Id7db696e22750f0f5649cee5121e8f491cb8f114 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Search for QML type before creating itMartin Smith2019-04-0213-145/+101
| | | | | | | | | | | | | | | | | | | | Because we have QML types that represent C++ classes, it is possible for qdoc to process a \qmlproperty command before it has processed the \qmltype for the QML type where the QML property belongs. This is because the \qmlproperty command can appear in a different .cpp file from the one containing the \qmltype command. If the .cpp file is parsed first, the QML type node won't exist when the \qmlproperty is processed, resulting in a qdoc error. This update forces qdoc to always check for the exist of the QML type before creating it and before creating any QML properties for it, and if the QML type does not exist, create it. If it does exist, use it. Change-Id: I78705aa95ee5bf3abc2e17fb2b6cd52191d54b68 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Eliminate need for the property group commandsMartin Smith2019-04-0212-449/+141
| | | | | | | | | | | | | | | We have been using the \qmlpropertygroup command to document complex properties. we also have the \jspropertygroup but it hasn't been used. However, we also have the shared comment concept, which we have used for documenting groups of functions. This update changes qdoc to use the shared comment concept for QML and JS property groups. The property groups commands are therefore no longer needed. But there are several uses of the \qmlpropertygroup command, and qdoc still recognizes these, although it uses the shared comment concept to handle them. The property group commands will be removed from the qdoc manual in a later update. Change-Id: Ie98638546756fd1a70067a7cd483c3b962c02954 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Purge xmlpattern dependency from qttools documentationAlex Blasche2019-04-011-2/+1
| | | | | | | The qtxmlpattern will become obsolete in Qt 5.13. Change-Id: Id5e67d4681f3fde9d09705aea3377727db71e964 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* linguist: Don't translate HTML-tagsRobert Loehning2019-03-281-5/+7
| | | | | | Change-Id: Ifaaa316c5ed0273790e9957d04f0c36c08803eb8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* assistant: Mark QCompressedHelpInfo, QHelpFilterdata as finalKai Koehne2019-03-273-6/+4
| | | | | | | | These are value classes that are not supposed to be inherited. Mark them as final and remove any virtual destructors. Change-Id: I86d42f8340e6c7b6013c6ed135079ecd9bd44cfb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QHelpFilterData, QCompressedHelpInfo: Add swap() methodFriedemann Kleint2019-03-274-0/+20
| | | | | Change-Id: I4be504cc4de6a6552b61108d0dd00d79d46308b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-03-2010-21/+75
|\ | | | | | | | | | | | | Conflicts: src/qdoc/configure.pri Change-Id: Iffd359fb2fa1480ea08253ef85bf2beff3ba188d
| * Handle recursion depth errors when parsing JavaScript in lupdateUlf Hermann2019-03-191-0/+7
| | | | | | | | | | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Task-number: QTBUG-74510 Change-Id: I0081d2d2e4385402022a6eb8b046e82ebd68983c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Designer: write out minimumSectionSize property before current sizeChristian Ehrlicher2019-03-181-16/+18
| | | | | | | | | | | | | | | | | | | | Make sure that minimumSectionSize is handled before currentSectionSize so a current section size lower than the default minimum section is properly handled. The same is done for QtBase in 7aa1078ecb8afd96050771635c0d3fa4238d3338. Change-Id: Id33ff11ef35cc92e0adf13402dc847b8f45c38a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Handle recursion depth errors when parsing JavaScriptUlf Hermann2019-03-187-0/+41
| | | | | | | | | | | | | | | | Implementations of QQmlJS::AST::Visitor are required to do so. Fixes: QTBUG-74510 Change-Id: I061240f15ce082a05dd7829d225a5bfc3edd896a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-152-5/+15
| |\ | | | | | | | | | Change-Id: I23480fa2e34e33736d27cd692474f660e81ce9da
| | * QDoc: Further improvements to libclang detectionPaul Wicking2019-02-212-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where llvm-config was installed without libclang-dev, the llvm-config candidate detection happily proceeded with the first version it found. This change improves on this by checking if the candidate also has clang-c/Index.h (our dependency). This change also adds llvm-config-8 as candidate for locating libclang, and tidies up some of the log messages from configure. Change-Id: I2746c5f427279ab38db4b20a123b695ecaebd1e9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 6ef3752a7a13b29a20b20c98cf6845f02f24c9c6) Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | qtdiag/Windows: Output all graphics adaptersFriedemann Kleint2019-03-141-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new functionality in the QPA interface. Task-number: QTBUG-50371 Task-number: QTBUG-65882 Change-Id: Id42ae50099fe5064e32dedbe6364254058a0508f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | qdoc: Make timestamps in LOG lines opt inMartin Smith2019-03-195-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beginning in 5.13, qdoc prints log lines in the the qdoc warning and error output that tell the reader what qdoc is doing. These can help the reader quickly see where qdoc is working when it prints warnings and errors. Each LOG line also included a timestamp, which was useful for measuring how much time qdoc was using in each phase of each module. But these timestamps made diffing sequential log files difficult, so the timestamps are now removed. They can be enabled for debugging qdoc by adding -timestamps to the qdoc commandline. Change-Id: I55ae24e642757eed2cb57028bd22626b6efc82f9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: Fix regressions in WebXML outputTopi Reinio2019-03-154-94/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An update to qdoc that refactored the index file output was not reflected in the webxmlgenerator. This commit implements a callback interface between QDocIndexFiles and WebXMLGenerator to enable the latter to append documentation to generated elements. This also eliminates virtually all duplicated logic between the two classes. Fixes: QTBUG-74424 Change-Id: Ia302bbfd290c8d74591cb4804458d5b73c301378 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: Use C++ 11 typed enums for the node enumerationsFriedemann Kleint2019-03-154-59/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for removing many ugly C-style casts. Change-Id: I3ea55a421989122d56ddc387a861e38fb459caff Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | qdoc: Add support for documenting pyside examplesVenugopal Shivashankar2019-03-122-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, qdoc cannot generate documentation for python examples as it expects a .pro or .qmlproject file for every \example command it finds. Since Qt Creator v4.9, developers can create a python project using the New Project wizard, which means qdoc could use the .pyproject file to verify the python example. Change-Id: Idcecdffe4f798bd1409123f988e3b826247aed72 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: WebXML: Generate output for text page nodesv5.13.0-beta1Topi Reinio2019-03-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously page (doc) nodes as well as example pages were aggregates. They no longer are, so we have to check against that specifically in order to generate output for them. Change-Id: If697104f62e3cb8de6caeb7ee758891ebf2fd077 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | qdoc: Remove trailing commaMartin Smith2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QML method and signal signatures were written with an extra comma. This update removes that extra comma. Change-Id: Iebe553e5a4438992b0115c8cafb0ffc7fb82b672 Task-number: QTBUG-74010 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Qt Designer: Fix deprecation warningsFriedemann Kleint2019-03-042-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | shared/previewconfigurationwidget.cpp:268:34: warning: ‘DirectoryOnly’ is deprecated: Use setOption(ShowDirsOnly, true) instead [-Wdeprecated-declarations] dlg.setFileMode(QFileDialog::DirectoryOnly); shared/qttoolbardialog/qttoolbardialog.cpp:1139:31: warning: ‘TextColorRole’ is deprecated [-Wdeprecated-declarations] Change-Id: Ia989156baf35c2be6f763c067da9440d0b2c7dee Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-021-0/+10
|\ \ \ | |/ / | | | | | | Change-Id: Id06ccca252abc84720b18909f55019266426eb97
| * | macdeployqt: Deploy the platforminputcontext plugins and vkb pluginsAndy Shaw2019-02-271-0/+10
| |/ | | | | | | | | | | | | | | | | When the gui module is used then the platforminputcontext plugins should be deployed. Additionally if that includes the virtualkeyboard plugin then those should also be deployed with it. Change-Id: I2787792e91a9cfe3603a4e2e29273f682942bf36 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Use QVersionNumber for version instead of QStringJarek Kobus2019-03-0110-35/+67
| | | | | | | | | | | | Change-Id: Ib44d3965f45272f7b791f1d164b0901d170c239d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Rename QHelpCollectionDetails into QCompressedHelpInfoJarek Kobus2019-03-014-52/+54
| | | | | | | | | | | | | | Fixes: QTBUG-74082 Change-Id: Ifbcb9076d2884f78f16b9d80859551c37c73954f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Remove setters for QHelpCollectionDetailsJarek Kobus2019-03-012-31/+3
| | | | | | | | | | | | Change-Id: If83486ad7c746beed79f3bd45da7d8ba832f25cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Add documentation about the QHelpCollectionDetailsJarek Kobus2019-03-011-0/+63
| | | | | | | | | | | | | | Change-Id: I6d3ff3cd13da201bc716b7bda7b1affda03fb323 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix filtering in case when using empty optionJarek Kobus2019-03-011-2/+4
| | | | | | | | | | | | | | | | It may happen that version or component value is empty for a specific documentation. Make this case work. Change-Id: I7133f1554d2fe72e3b9a4731e80245ceb051e596 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Make no option and invalid option texts customizableJarek Kobus2019-03-013-6/+51
| | | | | | | | | | | | | | | | | | This influences the preferences dialog, as now there will be "No version" and "No component" text displayed instead of one general "No option". Change-Id: I62da44fbb78f5f11c82d59dd5acf55868a8ec443 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Create default version filterJarek Kobus2019-03-012-3/+23
| | | | | | | | | | | | | | | | | | This mimics the behavior of old filters, where in 98% of use cases the qch file provided a separate filter for its module. Change-Id: I537d8336ea3cc0c6c894b494d7f2346df7499572 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix handling of current filter rename and removalJarek Kobus2019-03-011-3/+12
| | | | | | | | | | | | | | | | | | After renaming the current filter in preferences and applying changes, rename the current filter properly in the help engine. Change-Id: I5a70171b494b50b30f1d95a8cce05acd0f5c3b8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Enhance filtering by documentation version numberJarek Kobus2019-03-0114-38/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to filter the documentation by version number. This easily allows for showing the docs for one or more specified versions inside a custom filter. Task-number: QTCREATORBUG-19724 Task-number: QTCREATORBUG-7301 Change-Id: Ia0bc63666ab8152e43ffb6a6b6b99610e30575f7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | qdoc: Fix duplication of nodes in index filesTopi Reinio2019-02-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Aggregate class maintains a QMap of child nodes that is used for searching. PageNode entries may be added in the map multiple times, both with name() and title() as the key. When returning a list of non-function children, duplicates are now removed. Task-number: QTBUG-74009 Change-Id: I7e5df359313a53fa3b5bc4f9efa6e3ac6ea11eab Reviewed-by: Martin Smith <martin.smith@qt.io>
* | QtHelp: Make QHelpCollectionDetails destructor virtualKai Koehne2019-02-261-1/+1
| | | | | | | | | | | | | | | | | | Class is not final, nor do we prevent inheritance in any other way. This amends 7c39470f17, which got added for 5.13. Change-Id: Idbf82b58e5bd54b21ec2615cb2ebdc6cb5ece4a8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QtHelp: Add move operators to QHelpFilterData, QHelpCollectionDetailsKai Koehne2019-02-264-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add move constructors and move assignment operators to QHelpFilterData, QHelpCollectionDetails. Both classes are implemented in terms of a QSharedDataPointer, which offers a move constructor and move assignment operator, so it makes sense to just 'export' this to the class API. In addition, let the compiler create the implementations of the normal copy constructor and assignment operator. Change-Id: Id2d8a86b0b1e0a2e75fec989ae1f5442ead50410 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | QtHelp: Remove unused forward declarationKai Koehne2019-02-261-1/+0
| | | | | | | | | | | | Change-Id: Icf81ff0c3fb4e811f58a809bc01d6599a1f00b2c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Rename helpDetails to fromCompressedHelpFileJarek Kobus2019-02-263-3/+3
| | | | | | | | | | | | | | Task-number: QTBUG-73738 Change-Id: Id5ecec6fba37127032bf3f002a720615ccc18288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Application icons refreshAlessandro Portale2019-02-2120-0/+0
| | | | | | | | | | | | | | | | | | | | This change replaces the existing application icons with the newly designed ones. Task-number: QTBUG-70826 Change-Id: I4bd2c4116014eac4b0ac16efba28d50f4da936eb Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | qdoc: Fix duplicate section headers on C++ reference pagesTopi Reinio2019-02-191-5/+0
| | | | | | | | | | | | | | | | | | While merging commit 4367cf31 from 5.12 to dev, a section of the code that was supposed to be deleted was left around. This caused duplicate <h2> headers and in some cases, invalid HTML output. Change-Id: I6f535391a06eced97ebd5c03b45ffb2b10f0a89b Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-192-3/+6
|\ \ | |/ | | | | Change-Id: If9dc5f167e9471b4633db73ae5a1cb8c1312b478
| * macdeployqt: Deploy QtSpeech tts pluginSamuel Gaist2019-02-121-1/+2
| | | | | | | | | | | | | | This patch adds deployment of the QtSpeech plugins. Change-Id: Ifc55f40cdc0ed6fd9444993c04f4d76249649daf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * qtattributionsscanner: Add version to third-party component nameKai Koehne2019-02-121-2/+4
| | | | | | | | | | | | | | | | This is information important enough to show up in the title, and therefore also in the overview pages. Change-Id: I4bad7b46e186e34133a8a3cebe0c68cebec0e76c Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qdoc: Improve function overload handlingTopi Reinio2019-02-132-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QDoc calls Aggregate::normalizeOverloads(), process \internal function nodes last. This ensures that they get assigned overload numbers higher than the public ones, and adding internal overloads no longer shuffle around the public HTML anchors (that are based on the overload numbers). Also, when searching for functions, ensure that we don't return an \internal overload if a matching public one exists. This gets rid of a number of linking warnings. Change-Id: Idaac077e2f88d310e3261bf5b4c3df33ca02f873 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Add <sys/wait.h> include to fix build of FreeBSDAndré Klitzing2019-02-131-0/+4
| | | | | | | | | | | | | | | | ../shared/runqttool.cpp:96:16: error: use of undeclared identifier 'WEXITSTATUS' exitCode = WEXITSTATUS(ret); Change-Id: I96aa0324f3749702323217e5cf7f7570c80424a2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
View Lorry Controller Status