summaryrefslogtreecommitdiffstats
path: root/src/assistant/help/qhelpcollectionhandler_p.h
Commit message (Collapse)AuthorAgeFilesLines
* qhelpgenerator: Fix evaluation of timestampsMarcus Tillmanns2024-03-071-1/+2
| | | | | | | | | | | | Amends f11d7e4af73ca474ab71310961b155f6c9bc71da and b860d48aabfe43d1eb3c9c1c10bd3698d367c255 to correctly parse and compare timestamps. Fixes: QTBUG-122994 Change-Id: I1fb12200ef6fc1fdc58dd629d92a7c39e14ca29e Pick-to: 6.6 6.7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* QtHelp: More _L1Jarek Kobus2024-02-221-1/+1
| | | | | | | Task-number: QTBUG-122025 Change-Id: Icbdb003e9bd1b05bfb9d92002aab2aa5cc1aa0f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QtHelp: Remove unused methods from QHelpCollectionHandlerJarek Kobus2024-02-191-17/+0
| | | | | | | Task-number: QTBUG-122025 Change-Id: Ie2470fcf4337ea5dd4cb26b29f7058beff0cc415 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtHelp: Use more std::unique_ptrJarek Kobus2024-02-141-1/+1
| | | | | | | Task-number: QTBUG-122025 Change-Id: Ib29b14f56dd0401b986631bc685e652695857ff8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QtHelp: Bit more cleanup in cpp filesJarek Kobus2024-02-131-2/+2
| | | | | | | | | | | | Inline some short methods in private API. Use more {} for default constructed values. Fix indentations. Add some TODOs. Task-number: QTBUG-122025 Change-Id: I29062709f6d302a8768ead1c20eda3af5c256c74 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QtHelp: Some more cleanup in headersJarek Kobus2024-02-081-20/+8
| | | | | | | | | | | Use "= {}" for default args. Fix indentations. Task-number: QTBUG-122025 Change-Id: I1aad4dd795ca8d895a62bcf8641343eca6600457 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtHelp: Port includes to standard conventionJarek Kobus2024-02-071-2/+2
| | | | | | | | | | According to today's content of: https://wiki.qt.io/Coding_Conventions. Task-number: QTBUG-122025 Change-Id: I55f417060c989e28c38e1abaea1259bb87ccafe7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtHelp: Cleanup includesJarek Kobus2024-02-071-9/+6
| | | | | | | | | | Get rid of unused includes and forward declarations. Order includes and forward declarations alphabetically. Replace some includes with forward declarations. Task-number: QTBUG-122025 Change-Id: I224dc5371c982137b33f5b63c54f5da6cd435ce7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QHelpCollectionHandler: Fix static analysis warning about const-signalsFriedemann Kleint2023-05-031-1/+1
| | | | | | Pick-to: 6.5 Change-Id: I422dc9df9dfcbafbdde99708692e4b59d112e99e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Assistant: Deduplicate helper buildQUrl()Friedemann Kleint2023-01-131-0/+3
| | | | | | | | | It causes clashes in CMake Unity (Jumbo) builds. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I40ae560ff7e15aa8240736fe9bca14e756a67716 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use SPDX license identifiersLucie Gérard2022-05-191-38/+2
| | | | | | | | | | | 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>
* QtHelp: Reverse the default state for readonly property for help engineJarek Kobus2020-09-161-1/+1
| | | | | | | | | | | | | | | | From now the read only property is true by default. The old workaround with setting the dynamic property '_q_readonly' to true for the help engine should still work, so the change shouldn't break the user code with the workaround. This fixes the most common usage of QtHelp, when help engine is used for read only help collection files. Task-number: QTBUG-83268 Task-number: QTBUG-82126 Task-number: QTBUG-84745 Change-Id: Iee6fd18269d68f43633a5fecbb65abc60c99091a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* QtHelp: Fix documentsFor() when not using filter engineJarek Kobus2020-09-111-1/+9
| | | | | | | | Fixes: QTBUG-84727 Pick-to: 5.15 Change-Id: Id66cc071a24cc761dc63d044b7f74d0e1959cd22 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Assistant: Fix compilation issues with QMultiMapKai Koehne2020-08-131-14/+11
| | | | | | | Fixes: QTBUG-86030 Change-Id: I87387a795dbf6609d8f22a84d93f95d68bbb646e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix build with latest mocSamuli Piippo2020-06-041-1/+1
| | | | | | | | | | | Moc now needs the types to be fully declared and not just forward declared. | src/assistant/help/Help_autogen/EWIEGA46WW/moc_qhelpindexwidget.cpp:299:1: required from here | /usr/include/c++/9/type_traits:672:12: error: invalid use of incomplete type ‘struct QHelpLink’ | 672 | struct is_trivial Change-Id: I8282132239da61d49512e1f9f2c5cc2c4a86e3e3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Adapt the QtHelp API according to recent QMap changesJarek Kobus2020-03-191-4/+17
| | | | | | | | | | The usage of QMap as a multi map has just been deprecated. Adapt the QtHelp API accordingly. Introduce QHelpLink data structure. Fixes: QTBUG-82334 Change-Id: I8ff15710b1a433ddcb3000e5bcf58790c983e63f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QtHelp: add new useful methodsJarek Kobus2019-12-101-1/+1
| | | | | | | | This methods are going to be used in QtCreator help integration. Change-Id: If226ba3e612af013694afc8508527516e3e0daea Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Use QVersionNumber for version instead of QStringJarek Kobus2019-03-011-1/+2
| | | | | | Change-Id: Ib44d3965f45272f7b791f1d164b0901d170c239d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Create default version filterJarek Kobus2019-03-011-1/+3
| | | | | | | | | 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>
* Enhance filtering by documentation version numberJarek Kobus2019-03-011-0/+2
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-181-0/+3
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/assistant/help/qhelpcollectionhandler.cpp Change-Id: If1408a5893bc9ade9088e01c00aab695eff131aa
| * Assistant: Mark the readonly collection filesJarek Kobus2019-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | The qhc file may be installed in readonly location. Don't try to fix tables there, we leave it for the cached qhc file. Task-number: QTBUG-72174 Change-Id: I513c799d2b571a9dd9bc77b7c122e635c863fcff Reviewed-by: Kai Pastor <dg0yt@darc.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Create new filter tables inside qch filesJarek Kobus2018-10-171-12/+75
|/ | | | | | | Add a new internal API for dealing with new filters. Change-Id: Id26d90fe3e20aa576f6c2403cd36aa5e679a96b7 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Detect doc version number and fix jumping to the proper docJarek Kobus2018-06-051-1/+3
| | | | | | | | | | | | | | | | Add version-name metadata pair for the new documentation generated by qdoc. Use heuristics to detect version number when version inside metadata is not specified (applies to old docs). We do that only for qt documentation (we detect the qtproject prefix inside namespace). In order to match the proper namespace we compare the version numbers of the original location with the version number of the candidate list and pick up the matching one. Otherwise we behave like before. Task-number: QTBUG-59363 Change-Id: Id9f3d7d91e53647e2ad8d485d96888e80ce4f5b2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Assistant: Fix clang warningsJarek Kobus2018-05-141-1/+1
| | | | | Change-Id: I8315c97fcd20ea9be90f4258628b88c809dc7fdb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Store the copy of the index inside the help collection fileJarek Kobus2018-04-231-9/+61
| | | | | | | | | | | | | | | | | | | | This avoids having to open all .qch files at startup, which is slow and can lead to contention on open file handles. This change is backward compatible. The old help lib won't use the new tables. The new help lib will generate the new tables on first run or regenerate them when it detects they are not anymore in sync. Store also the timestamp info about the qch files and compare it upon every startup. If it doesn't match then new tables' data is regenerated. The case when running new Creator, then running old Creator and reconfiguring doc set and then running new Creator again should work properly. Task-number: QTCREATORBUG-18242 Change-Id: I7f656935ae2383b866b27e256eec23dab588efc5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Create QHelpCollectionHandler's query dynamicallyJarek Kobus2018-04-051-2/+2
| | | | | | | | | | | | | | | | It fixes a warning about the use of db from the wrong thread. Before, the default m_query object was created in QHelpCollectionHandler constructor which caused the warning to appear. Now we create m_query object dynamically instead. This also fixed a leak in QHelpCollectionHandler::openCollectionFile() where two early returns, after the database had been opened, neither closed it nor set m_dbOpened. Change-Id: I24484d25d9d90b1a5d6fe4a5acb61c834e2b9599 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Assistant: Don't query the database for unneeded dataUlf Hermann2018-03-221-1/+1
| | | | | | | | | If we only need registered documentations of a specific namespace we can restrict the SQL query accordingly, so that we don't have to iterate through all the results afterwards. Change-Id: I124cf16ed95e1010b8a05d8cb723c2a1f03120d4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Updated license headersAntti Kokko2016-06-101-14/+20
| | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I25237f97989d42da1130ed5c0839c31eb3904d34 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update copyright headersAntti Kokko2015-02-141-7/+7
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* whitespace fixesOswald Buddenhagen2014-01-201-1/+1
| | | | | | | | remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-251-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061-1/+1
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'origin/refactor' into masterLars Knoll2011-09-131-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/help/help.pro src/designer/src/components/formeditor/formwindow.cpp src/designer/src/components/formeditor/formwindow_dnditem.cpp src/designer/src/components/formeditor/layout_propertysheet.cpp src/designer/src/components/formeditor/qdesigner_resource.cpp src/designer/src/components/lib/lib.pro src/designer/src/components/signalsloteditor/signalsloteditor.cpp src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp src/designer/src/components/widgetbox/widgetbox_dnditem.cpp src/designer/src/components/widgetbox/widgetboxtreewidget.cpp src/designer/src/lib/lib.pro src/designer/src/lib/shared/qdesigner_formbuilder.cpp src/designer/src/lib/shared/qdesigner_propertysheet.cpp src/designer/src/lib/shared/shared.pri src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro src/linguist/lupdate/qdeclarative.cpp src/linguist/shared/profileevaluator.cpp src/linguist/shared/qph.cpp src/linguist/shared/ts.cpp src/qtconfig/mainwindow.cpp src/shared/qtgradienteditor/qtcolorline.cpp src/shared/qtgradienteditor/qtgradientwidget.cpp sync.profile Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
* Get assistant to compile against refactorLars Knoll2011-09-131-0/+124
Give the source code a somewhat saner structure while I'm at it. Change-Id: I99766405debe231a0562dd623ba1d17f19333656 Reviewed-on: http://codereview.qt-project.org/4829 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 22:45:54 +0000