summaryrefslogtreecommitdiff
path: root/src/qtattributionsscanner
Commit message (Collapse)AuthorAgeFilesLines
* Allow to opt out of source path checksKai Köhne2023-03-313-15/+31
| | | | | | | | | | | | | | | | | | Commit 454ab5ffd5b07 ff let qtattributionsscanner bail out if the content of the "Path" and "Files" properties are not valid relative file paths at the time qtattributionsscanner runs. For Qt for MCU tough, the relative path to third-party files does differ between the git checkout, and the source SDK as given to the user. This patch, therefore, allows opting out of the check by adding a --no-path-checks option. Pick-to: 6.5 Change-Id: I809b52e233a6b56194feb1b5b8168f36ba1b9972 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Allow a Comment field to document clues to updatersEdward Welbourne2023-03-101-1/+6
| | | | | | | | | | | There's no comment mechanism native to JSON and our tooling is fussy about rejecting an attribution file if it has any unknown keys; so provide a key to serve as a work-around, in which developers can leave notes to those reading the attribution later. Pick-to: 6.5 Change-Id: Ibd80b773d1c28715ec7c10a087f663a921b9ca6c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qtattributionsscanner: Add SecurityCritical attributeKai Köhne2023-03-063-3/+19
| | | | | | | | | | | | | | | | | | | Serves as an indicator in the release process that these components need to be carefully monitored and updated (even more often than the other third-party modules). So far this is not reflected in the generated documentation. This might change in the future though. For reasoning, see also https://lists.qt-project.org/pipermail/development/2023-February/043667.html Pick-to: 6.5 Change-Id: I82c59e0198fc2fdc855aed89aa49f929391aa0ef Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Pervasive conversion of attribution scanner to Qt::StringLiteralsEdward Welbourne2023-02-284-112/+113
| | | | | | | | Map QLatin1String("...") to "..."_L1, QStringLiteral("...") to u"..."_s. Pick-to: 6.5 Change-Id: I2f6b2bf94bbcc982d90363a735d048f7eb5cb946 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-081-9/+1
| | | | | | Pick-to: 6.5 Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qtattributionsscanner: Do not get stuck for invalid PathKai Köhne2023-01-051-11/+21
| | | | | | | | | Do check early on that the Path directory actually exists, and print a warning if not. Pick-to: 6.4 6.5 Change-Id: I4a09182820f809e2f004101886d2f6ee0515dbd6 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* qtattributionsscanner: Fix QTextStream/QFile construction orderTopi Reinio2023-01-021-1/+1
| | | | | | | | | | | | | Local objects are destroyed in the order reverse to their construction; the destructor of QTextStream attempts to flush an already-destroyed QFile object. Flip the order of their construction. Pick-to: 6.5 6.4 5.15 Fixes: QTBUG-109618 Change-Id: I10d468289aee82159ffe6f292522e91752aabb3b Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* qtattributionsscanner: Read 'Files' property as array of stringsJoerg Bornemann2022-12-091-1/+17
| | | | | | | | | We change the type of 'Files' to array of strings. We still allow the legacy "string with files separated by space". Pick-to: 6.4 Change-Id: I4bd33906a5c90e4c747443ec40b4e2f6fa72261b Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* qtattributionsscanner: Sanity-check content of 'Files'Kai Köhne2022-12-091-0/+15
| | | | | | | Warn if the files listed actually do not exist. Change-Id: I94557a139401d87eb173cec34fab82c47c8cacd2 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* qdoc: Fix various clang warningsFriedemann Kleint2022-12-021-6/+6
| | | | | | | | | | | | - remove unused variables - Use QString::arg() with multiple string arguments - Avoid detaching containers in loops Pick-to: 6.4 Change-Id: I9b29f5a0269f288b7de862eccdcee9750248dce8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* qtattributionscanner: Fix glitch in validatePackageJoerg Bornemann2022-11-161-1/+1
| | | | | | | | In "silent log mode" one validation check was dysfunctional. Pick-to: 6.4 Change-Id: Ia062b7096f00e1d1289ad748a221e99054412109 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* qtattributionsscanner: Fix incorrect */ for multiple license filesKai Köhne2022-11-141-3/+2
| | | | | | | | Amends commit 59a6e371b Pick-to: 6.4 Change-Id: Ib73cd9fd3d569f79c546814c9d5dd3d2b296e035 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Monthly re-run of clang-tidy qt-* checks (11/2022)Marc Mutz2022-11-021-1/+1
| | | | | Change-Id: I8c9b7a204764cd1eb2cdd0dd10e44198f6140ff7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qtattributionsscanner: Read license files from LICENSES directoryJoerg Bornemann2022-10-171-0/+78
| | | | | | | | | | | | | | | | | | | If the 'LicenseFile[s]' property is empty in the qt_attributions.json file, we now extract the SPDX license identifiers from the SPDX license expression in the LicenseId property. The extracted SPDX license identifiers are used to locate license files in the LICENSES directory up in the directory hierarchy. If we encounter a license ID without matching license file, we print an error message. This enables us to deduplicate license files in our repositories. Pick-to: 6.4 Fixes: QTBUG-104126 Change-Id: I38b281c97e039a8158e143ffa16ba1966713d030 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qtattributionsscanner: Exit with error for qt_attribution.json warningsKai Köhne2022-10-175-74/+147
| | | | | | | | | | | | | | | | | | | | | So far qtattributionsscanner did print warnings for erroneous or incomplete qt_attribution.json files, but still generated output and returned normally. Let's be more strict, and actually fail in these cases. This also required moving the resolution of referenced copyright and license files from the generation to the scanning phase. Do be more lenient with Chromium attribution files though, because we don't really control them. With this in place, make docs for Qt modules should fail if incorrect qt_attribution.json files are found. Pick-to: 6.4 Fixes: QTBUG-107106 Change-Id: I3d0192dfb966b4422410d0b1fb4ba4652a5303cf Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-061-1/+1
| | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I234704ba429750ddee958a82f6c941d041da0653 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Port from container::count() and length() to size()Marc Mutz2022-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | This is a semantic patch using ClangTidyTransformator as in qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8: auto QtContainerClass = anyOf( expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o), expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o)); makeRule(cxxMemberCallExpr(on(QtContainerClass), callee(cxxMethodDecl(hasAnyName({"count", "length"), parameterCountIs(0))))), changeTo(cat(access(o, cat("size"), "()"))), cat("use 'size()' instead of 'count()/length()'")) a.k.a qt-port-to-std-compatible-api with config Scope: 'Container', with the extended set of container classes recognized. Change-Id: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QDoc: Remove Node::PageTypeLuca Di Sera2022-09-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc uses a series of internal structure, based on an inheritance tree with base `Node`, to represent elements that are documentable and their properties. For documentable elements that generate a documentation page in the output, such as a documented C++ class, a subtree of the hierarchy, starting at `PageNode`, is used. A `PageNode`, and more generally a `Node`, can have a "Page Type", representing the type of element that the output documentation should represent. This is implemented in terms of an enumeration and an internal memeber of that enumeration. Supposedly, originally there was almost no hierarchy of types for `PageNode`s, and the enumeration was used as a form of tagged union to discern the the type of page that the `PageNode` would produce to determine the valid operations on it and the required computations that should have been performed during a generation. At some point in QDoc lifetime, some of the types implied by `PageType` were promoted to actual types under a `PageNode` hierarchy, for example `ExampleNode`, such that the use of `PageType` was reduced. Today, `PageType` is used only when parsing a "\page" command, which generates a `PageNode`. The "\page" command, which declares that a comment-block should generate a standalone documentation page in the output that doesn't document any specific or code-level element, takes an argument representing the name of the generated file and, optionally, a second argument. The optional second argument is a bare string that, if of a specific form, is used to define the type of the generated `PageNode` that represents the page. For example, a second argument of form "api" would mark the `PageNode` with as being of type `PageType::ApiPage`. Generally, this information is not used at all during the rest of a QDoc execution, as none of the remaining `PageType` nodes that don't have an actual type require special handling. There is, albeit, one exception to this. When the second argument of a "\page" command is "attribution", the `PageNode` has type `PageType::AttributionPage`. This type is meaningful as it is later used to collect "Attribution Pages" for a certain module so that QDoc can generate a list of them in Qt's documentation. "Attribution pages" are a special type of page that are used in Qt's documentation to "attribute" usages of third-party libraries, so as to comply with their licensing. Those pages are only expected to be generated by "qattributionscanner", which takes care of parsing json-defined attribution metadata for third-party libraries to generate the required attribution page. Thus, while `PageType` is generally not required, this specific behavior has to be supported. Hence, we remove `PageType`, replacing it with an equivalent behavior that only handles attributions. The `PageType` enum in `Node` is now removed. `Node::pageType`, the getter for the current `PageType` of `PageNode`, the two `Node::setPageType` overloads, the setter for the `PageType` of a `PageNode` and `Node::getPageType`, a converter from `Node::NodeType` to `Node::PageType`, were removed as they have no meaning anymore. The member `m_pageType` of `Node`, that contained the current "Page Type" of a `Node` instance, was removed as it lost its use. The constructor for `Node` is now modified to not set a `PageType`. The constructor for `PageNode` that took a `PageType` to set was removed, as it lost its use. As a consequence, the code that handles the "\page" command in `CppCodeParser::processTopicCommand`, was removed call the constructor for `PageNode` that does not require a `PageType`. Furthermore, the same code was modified to not process the second argument of a "\page" command anymore. The parsing and retrieval of the second argument is tied to the current model used by `DocParser`, which is general for topic commands, and cannot be easily removed, such that it will still be valid to pass a second argument albeit it will be completely ignored. The documentation in QDoc's manual that explains the usage of "\page"'s second argument was removed as a consequence. The code in `QDocIndexFiles` that writes and reads a `PageNode` was modified to ignore the type, where possible, while keeping a similar structure for the produced format. To preserve the "Attribution Pages" behavior, a new member, `is_attribution`, was introduced in `PageNode`, acting as a flag, defaulting to false, that is set when a `PageNode` is an "Attribution Page". A setter that turns on the flag, `markAttribution`, and a getter that reads the flag, `isAttribution`, were added to `PageNode`. Albeit in a more contained scope than the previous `Node` scope, the new members are too broadly scoped compared to their actual usages. For example, a `ClassNode` is allowed to be an "Attribution Page" albeit we don't expect that to make sense. Due to the low granularity of QDoc's internal representation, fixing this would either require a bigger refactoring or the introduction of new idioms, both of which are not an amount of work that is intended to be undertaken as of this patch. The code in `Aggregate::findAllAttribution`, that is used to build the list of "Attribution Pages" in a module, was modified to use the new methods to discern whether a child node is an "Attribution Page". A new command, "\attribution", was added to allow a user to mark a "\page" as an attribution. The command is not intended to take any arguments and will simply mark the documented page as being an "Attribution Page". No user-facing documentation for the command is provided as the command is intended only to support the internal "qattributionscanner" behavior in Qt's documentation and should not be used manually or in other places at the current time. The necessary code to handle the command was added to `CppCodeParser`, turning on the relevant flag when the command is found and producing a warning if the command is not in a "\page" comment-block. Due to the limited granularity of QDoc's datatypes, the command will incorrectly pass for non "\page", non `Aggregate` comment-block, such as "\example", where it could produce seemingly incorrect documentation. This is something that should be addressed separately in a general look at QDoc's internal structures. The code in `QDocIndexFiles::readIndexSection` that reads back a `PageNode` was modified to call `PageNode::markAttribution` when reading back a `PageNode` that is an attribution. The generator of QDoc's "Attribution Pages" for "qattributionscanner" was modified to output an "\attribution" command on the line following the "\page" command produced for an "Attribution Page" instead of generating an "attribution" argument for the "\page" command itself, to be compliant with the new interface. Change-Id: I41405fd4db884d98463a43bff8815c4504dc00ea Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qtattributionsscanner: Allow */ to appear in license textsKai Köhne2022-08-311-5/+14
| | | | | | | | | | | | | | | | | | | | | | | License text files might contain */ (end of C style comment) , for example when explaining how to attribute a license in a file. So far, this broke the qdoc output, because qdoc also looks for */ as end of documentation marker. Work around this by masking the star through a qdoc \badcode argument, so that */ becomes \badcode * \1/ \endcode Pick-to: 6.4 Change-Id: I77310ed272177eaa69e354c0d7bce380ee933e56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Luca Di Sera <luca.disera@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-251-1/+1
| | | | | | Task-number: QTBUG-105718 Change-Id: I2df3a8aec11f30f301e3143e9960156b6f45e614 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-08-021-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I41a2c9aa6a933a4e3dda5d5b4c70c461912907b2 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-1911-297/+22
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I5335388c0472b0ee554234fc7eca60769e504660 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Fix qttools build after include cleanup in qtbaseVolker Hilsheimer2022-03-181-0/+1
| | | | | | | | QMap and QHash need to be explicitly included. Pick-to: 6.3 Change-Id: I43de3cdf0911c5ed5d86a2107c15cc32d94da30a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Skip unnecessary commands when cross-building toolsJoerg Bornemann2021-10-051-0/+1
| | | | | | | | | | Call qt_internal_return_unless_building_tools() directly after qt_internal_add_tool() to avoid having to special-case code for when this function only creates imported targets in cross-builds. Task-number: QTBUG-85084 Change-Id: Idca39920aa8e784db86a658c65bd708ae51b60c1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Document Qt Assistant licensesKai Köhne2021-09-271-1/+3
| | | | | | | | | | | Make sure that the 3rd party qlitehtml licenses are visible in the Qt Assistant documentation. This also requires a small extension for qtattributionsscanner, so that 'tools' documentation can be picked up, too. Pick-to: 6.2 6.2.0 Change-Id: Ib90004c1f3c74b42cbf00156674fab92d59057a8 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
* Remove Qt 5 leftover filesKai Köhne2021-07-141-67/+0
| | | | | | | Pick-to: 6.2 Change-Id: I6d9593d122342f9852abce0f4c5262159eb9db43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qtattributionsscanner: Fix inclusion of CopyrightFile contentKai Köhne2021-06-011-1/+2
| | | | | | | | Amends 4d3c39155 Pick-to: 6.1 Change-Id: I2c518bddcc7eb8ae525551c0712604fced700f16 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Move qtattributionsscanner to libexecKai Köhne2021-05-311-0/+1
| | | | | | | | | | | | | The tool is only used for building the Qt documentation, and not documented. This requires a follow-up patch in qtbase. Pick-to: 6.1 Task-number: QTBUG-88791 Change-Id: I4a37249087a890e7fdb47ed6a2d89daec43d74dc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-122-55/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I3f360105a8cd43ad37dec6bfc6509ce95c79ee76 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-092-70/+0
| | | | | | | Pick-to: 6.0 Change-Id: Id8b82e7838c3b142cbd9118689bafae0bbe2beb1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Don't make qtattributionsscanner depend on QtGuiVolker Hilsheimer2020-10-233-2/+4
| | | | | | | | It only uses QtCore classes. Change-Id: I2014d75f26f9b954c36b0e291064a2c2c7b3fb83 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove old Qt 5 CMake build system files (take 2)Kai Koehne2020-10-071-37/+0
| | | | | | | | See 8d100101aa7e86 for a similar change in linguist.pro Fixes: QTBUG-87185 Change-Id: Ibd0b225a64abcb8fcc6a16b523ecdaa40456da32 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-012-2/+2
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I84f5fc4eb26f95d81ce5b5b8cc72706bb9185026 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qtattributionsscanner: Linkify dejacode URN's for LicenseIdKai Koehne2020-09-071-2/+6
| | | | | | | | | | | | | | | | | So far we only allowed SPDX license ID's. Anyhow, there are some licenses not represented in SPDX, but in the much vaster DejaCode database. This is the case e.g. for the Bitstream Vera Font License, which is tracked in Qt Gui and currently leads to a 404: https://doc.qt.io/qt-5.15/qtgui-attribution-vera-font.html To avoid having to flag all such licenses as 'NONE', we now allow LicenseID to contain URN's of the form urn:dje:license:, see also https://enterprise.dejacode.com/urn/urn:dje:license/ Pick-to: 5.15 Change-Id: Ibf42f00452dbf5d28318b3217a9fe74e33f7c97c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qtattributionsscanner: Add property CopyrightFileKai Koehne2020-07-244-2/+31
| | | | | | | | | | | | | JSON doesn't really support linebreaks in strings. So far we do allow them in qt_attribution.json files though because Qt's JSON parser does support them. One of the fields most often affected by this is "Copyright". Allowing users to store multiple copyright lines in a separate file is an easy way to deal with this. Change-Id: I9578906f0c1cac0cfca007813feb7e926e75c730 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qtattributionsscanner: Support multiple license filesKai Koehne2020-07-244-24/+51
| | | | | | | | | Accept a new LicenseFiles array that allows to list multiple license files. This avoids the need to artificially concatenate licenses in one file. Change-Id: Ia9db77b3bc0ea7fc6072d0296da5ea3cfce44b59 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* CMake: Regenerate qttoolsAlexandru Croitor2020-06-292-2/+16
| | | | | Change-Id: I215dd95fe4467b2b2a7c24b1b5be523ef2e83980 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Other tools: Use QList instead of QVectorJarek Kobus2020-06-097-16/+16
| | | | | | Task-number: QTBUG-84469 Change-Id: I3c195691a310226ab0eee76c0f60ffa4751dee62 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* CMake: Fix name of host tools on WindowsKai Koehne2020-05-191-0/+2
| | | | | | | | | | | | | | Make sure that qdoc, qtattributionsscanner, get an .exe if built on Windows. CMAKE_BIN_PREFIX is usually defined via create_cmake.prf, but in the case of the two tools this isn't used. Fixes: QTBUG-84304 Pick-to: 5.15 Change-Id: I5d8d77b07012187c7939b9eb1afa9ddffac8c918 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Remove QTextCodec dependencyLars Knoll2020-05-181-1/+0
| | | | | Change-Id: I07100f610eb2944190eb69432497417520cd4e58 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAlexandru Croitor2020-04-152-1/+4
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: a bunch of .pro and configure.json file adjustments and some conflicting cherry-picks from dev -> 5.15 that are merged into dev again src/assistant/assistant/main.cpp Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2
| * Add configure features for remaining qttoolsMitch Curtis2020-03-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | I only need qdoc from qttools, but building the other tools takes up quite a bit of time. qdoc already has a configure feature, so account for the rest of them. Change-Id: I0fc60393a1841229025c42b83d06f01668eb2680 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Doc: Remove \contentspage commandsTopi Reinio2020-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | The command is deprecated and has no effect apart from generating a documentation warning. Drop the command also from the output generated by qtattributionsscanner. Change-Id: Ic286909215d55f4062ea0af790bfb9be91747a98 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | CMake: Regenerate projectsAlexandru Croitor2020-04-091-0/+55
| | | | | | | | | | | | | | | | | | This allows building on iOS and Android, because of the new qtNomake support exclusion of GUI tools. Change-Id: Idec2b68e6978df9a3e3f818d235aab243bfca649 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | CMake: Fixup tools assignment to modulesAlexandru Croitor2020-03-261-0/+1
| | | | | | | | | | Change-Id: Iedc10edcede099e91a3f771291aed0168d2f2835 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qdbus/qtattributionsscanner: Remove usages of QRegExpFriedemann Kleint2020-03-251-2/+1
| | | | | | | | | | | | | | | | It will be moved to Qt5Compat; avoid the dependency if possible. Change-Id: I6ede684047702928e20345df8119f54bf0233cb8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-182-1/+12
|\ \ | |/ | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-021-1/+1
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I7137cf8339bfe9fdcf4cb7cc695cb146aef410fb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * CMake: Add Qt6 forward compatible CMake API and targetsAlexandru Croitor2020-01-241-0/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-74137 Task-number: QTBUG-80477 Change-Id: Ib33f27e476bad1cdffda1539c8befaea9070a7e6 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Regenerate projectsAlexandru Croitor2019-11-151-2/+1
| | | | | | | | | | | | Change-Id: If18187b15a506fb6fda6b2d0c7d6943e806ec252 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status