summaryrefslogtreecommitdiff
path: root/src/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Assistant: Make QResultWidget linkColor styleableJarek Kobus2021-06-141-6/+18
| | | | | | | | | | | | | | | | | | Add a property "linkColor" of QColor type to the QResultWidget class. Now it's possible to style the link color in search result widget through the following stylesheet: QResultWidget { qproperty-linkColor: red; } Fixes: QTBUG-74353 Change-Id: Ife57b5a64154be83f6eab4ef533840c51aefd1f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 178313751273284b1f0167391af721f006a677c5)
* Update internal assistant documentationJarek Kobus2021-04-271-0/+0
| | | | | | | | | | Task-number: QTBUG-65810 Fixes: QTBUG-91069 Change-Id: If691187ab329a829f0bcf3ab261a0e8d0a7879e7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit a73f31b10bc21b5ba461b932be761ffbdf5f7a43) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove QMake project filesJoerg Bornemann2021-02-128-532/+0
| | | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. 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> (cherry picked from commit aeaa9e2a46a3d8785c446d8a6347d6f82667cef8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump copyright year to 2021Friedemann Kleint2021-02-031-1/+1
| | | | | | | | Fixes: QTBUG-89980 Change-Id: Ice588f78d392f1dfd1f96de8840a3c7e28e4edd1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 0a097b742dcffc04690e98ce2e574febad25014d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: Scroll to current item in Contents window after syncAlexander Volkov2021-01-131-0/+1
| | | | | | | | It's annoying to scroll manually. Change-Id: Ie3c8cd46e72c3d712526b00f7b982d00b92da45b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Fix compile warning following change in qtbaseVolker Hilsheimer2020-12-031-1/+1
| | | | | | | | | | | | | | | | QPersistentModelIndex casting to QModelIndex now returns a value, not a reference. This fixes compiler warning src/assistant/assistant/bookmarkmodel.cpp:131:29: warning: loop variable 'index' has type 'const QModelIndex &' but is initialized with type 'const QPersistentModelIndex' resulting in a copy [-Wrange-loop-analysis] note: use non-reference type 'QModelIndex' to keep the copy or type 'const QPersistentModelIndex &' to prevent copying Pick-to: 6.0 Change-Id: I940845d52f9237ea6c8331ecd5cc29289dfefe8c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Clamp registered collection time-stamp to SOURCE_DATE_EPOCH if setKai Pastor2020-12-011-1/+9
| | | | | | | Task-number: QTBUG-62697 Pick-to: 6.0 5.15 Change-Id: I73cc41db9c57d050783e963896f9696c294126c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Revert "Exclude assistant from build"Kai Koehne2020-11-233-3/+10
| | | | | | | | | | This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d. Reason for revert: See discussion in QTBUG-86746 Pick-to: 6.0.0 6.0 Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Assistant: Fix tr()-callsFriedemann Kleint2020-11-211-2/+3
| | | | | | | | | | Use static calls, fixing: src/assistant/assistant/helpdocsettingswidget.cpp:72: Cannot invoke tr() like this src/assistant/assistant/helpdocsettingswidget.cpp:72: Class 'HelpDocSettingsWidgetPrivate' lacks Q_OBJECT macro Pick-to: 6.0 6.0.0 Change-Id: I2debf4b1dc7ef514a665f0b509257ff0313c6cdd Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Assistant: Fix missing documentationJarek Kobus2020-11-091-1/+1
| | | | | | | | | | | Move a call to initFileSystemWatchers() after setting the readonly mode, since initFileSystemWatchers() triggers setup with unwanted mode. Broken by accident in 15d7a30d41b423846fc74d9dd252c1e2a84769e2 Fixes: QTBUG-87783 Change-Id: I6d79fea010af28c2a839ef4aa6f0f802669ea7bd Reviewed-by: hjk <hjk@qt.io>
* Doc: Enforce zero documentation warning policyTopi Reinio2020-11-072-0/+4
| | | | | | Task-number: QTBUG-78069 Change-Id: I3809c090fd46fefeefaad003d648f9d9db56f8f5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Fix documentation warnings for qttoolsTopi Reinio2020-11-075-54/+15
| | | | | | | | Fix linking failures caused by the removal of Qt Assistant, and fix usage of obsolete/removed functionality. Change-Id: Iaefbebcc1371b41429377dc8219101bda9fbf79a Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove deprecated qcollectiongeneratorJarek Kobus2020-11-067-162/+1
| | | | | | | | qhelpgenerator should be used instead. Fixes: QTBUG-82336 Change-Id: I09b8bbf9245c892ec7cff903405b6859ba74ae30 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Exclude assistant from buildJarek Kobus2020-11-053-10/+3
| | | | | | | Task-number: QTBUG-86746 Tash-number: QTBUG-88123 Change-Id: Ia086ab9a7c193e7829ef886929dc921432f67a1b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove usage of deprecated QStandardPaths::DataLocationKarsten Heimrich2020-10-212-3/+3
| | | | | | | Task-number: QTBUG-87037 Change-Id: I8bf93379a6c0243b823114628b7fa1422625fbb7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QStringConverter usageMårten Nordheim2020-10-122-6/+6
| | | | | | | Following fa8d021fa6fcb040fb702b6ffd2deee52a3b748a in qtbase Change-Id: I46495c1f0cde4e304e414b05cd66d14b00afd6b1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-018-26/+26
| | | | | | | | 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>
* QtHelp: Reverse the default state for readonly property for help engineJarek Kobus2020-09-169-5/+46
| | | | | | | | | | | | | | | | 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>
* Fix warnings from using deprecated QLibraryInfo APIVolker Hilsheimer2020-09-164-4/+4
| | | | | | | | As of 557623cc4f22295e5e89462dfdff20d78b3b9cdc in qtbase, QLibraryInfo::location is QLibraryInfo::path. Change-Id: I6e4788011fd8f64f5a433b00cb327c2afcf68527 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix compile warning from deprecated application attributesVolker Hilsheimer2020-09-151-2/+0
| | | | | | | | | | | | | | AA_DisableHighDpiScaling and AA_UseHighDpiPixmaps have been deprecated. As of 90358f6042d1fe2db849e17e1b0c875fb0560b20 and 2dc46c09026362cc267b1183faf09fb29479ef93 in qtbase, respectively, these settings are deprecated and have no effect. Remove their setting, and also the respective command line options in Qt Designer and the pixeltool. Change-Id: Iaa057f6a8a8396b822d9190f17e5f9c73e9cc2bb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QtHelp: Prevent the endless loop when using filter engine and setupJarek Kobus2020-09-151-3/+8
| | | | | | | | | | | | | | | In case when the user is connected to QHelpEngineCore::setupFinished() signal, he may call QApplication::processEvents(), what may trigger delayed signal QHelpFilterEngine::filterActivated() synchronously and in turn call QHelpFilterEngine::setup() recursively. In order to fix this case we unmark the need for setup unconditionally just before calling m_helpEngine->setupData() and mark it back again only if this call failed. Task-number: QTBUG-85988 Change-Id: I5eba420ffb10a72f6521c6c8ebdceecfa07af9df Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Assistant: Use new config system for cursorJarek Kobus2020-09-151-4/+4
| | | | | | Pick-to: 5.15 Change-Id: I528a4d5f2bcefc42cdec08d6742936ccdbc4ae84 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Assistant: fix build with QT_NO_CLIPBOARDJarek Kobus2020-09-159-19/+49
| | | | | | | Fixes: QTBUG-86598 Pick-to: 5.15 Change-Id: I02348fc3b3b8e842a2aaaac6f98078f86ba2a767 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix build in qttoolsLars Knoll2020-09-141-3/+3
| | | | | | | FIx build after API cleanups in qtbase Change-Id: I578e05649a754de77fb058c71f3c283eaf62d4d9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QtHelp: Fix documentsFor() when not using filter engineJarek Kobus2020-09-113-33/+83
| | | | | | | | 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>
* Use operator| to compose key sequencesFriedemann Kleint2020-09-071-4/+4
| | | | | | | | | | | In preparation for deprecating operator+. It's deprecated in C++20. Insert casts as necessary. Drive-by, prepare for deprecation of operator+ for building key sequences. Initial-patch-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Pick-to: 5.15 Change-Id: Iaae4e35a56aa1c2365bc25af2582cf820de38d5e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Remove old stuffJarek Kobus2020-09-041-2/+0
| | | | | | Change-Id: Ib7233970ed0dd0df97979e3ed18fc57d6046d00b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Regenerate load(qt_app) projectsAlexandru Croitor2020-08-262-14/+79
| | | | | | | | | | These now use the new qt_internal_add_app function. Also the script will output necessary code to set the icons and resource files for each of the apps. Task-number: QTBUG-85757 Change-Id: I1a336243fc53a7f329ca17e6c1e40818dabeae30 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove deprecated functionalityLars Knoll2020-08-244-73/+0
| | | | | | | Required to get the module to compile against a new qtbase Change-Id: I4f7c6f10c94da640c1f1eec0bbbbc22bbd7cb2ea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix against latest qtbase changesMaurice Kalinowski2020-08-181-0/+1
| | | | | Change-Id: I18127718b1d9899678d26866f940e44990878d26 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Assistant: Fix compilation issues with QMultiMapKai Koehne2020-08-139-60/+55
| | | | | | | Fixes: QTBUG-86030 Change-Id: I87387a795dbf6609d8f22a84d93f95d68bbb646e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Include <QHash> in header that uses QHashEdward Welbourne2020-08-101-0/+1
| | | | | | | Include what you use ! Change-Id: I308c558adb476f2f982ae9379d036c86d89acb8f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Replace Qt::MidButton with Qt::MiddleButtonEdward Welbourne2020-08-107-22/+23
| | | | | | | | The latter has been the preferred name since Qt 4.7.0. Pick-to: 5.15 Change-Id: Ic6e1969788fb408929614474faac0bfc3fdfb602 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* CMake: Regenerate qttoolsAlexandru Croitor2020-06-298-4/+22
| | | | | Change-Id: I215dd95fe4467b2b2a7c24b1b5be523ef2e83980 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-261-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: I94f7f1bf32e2fd9b6ee5624006eeb313ca525c14 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Silence warnings after deprecation of QApplication::mouseButtonsVolker Hilsheimer2020-06-231-0/+3
| | | | | | | | ... and keyboardModifiers in qtbase. Change-Id: I55e88d936154d8aac9acced1c78482b8de7cb20a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Port QtTools from QStringRef to QStringViewKarsten Heimrich2020-06-151-1/+1
| | | | | | Task-number: QTBUG-84319 Change-Id: Idb5a41172ea38b2f4edf385d67c1cdc2968a8d8c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Assistant: Use QList instead of QVectorJarek Kobus2020-06-0911-28/+27
| | | | | | Task-number: QTBUG-84469 Change-Id: I92541d8a81574af605c206ddcd482cff26ec8765 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-06-083-0/+3
| | | | | Change-Id: I2ba5abbd070c56e99b5fa3683c1c2c38af0e1348 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Doc: make it clearer that setUsesFilterEngine is required for filteringSamuel Gaist2020-06-081-4/+5
| | | | | | | | | The new API to use is an "opt in" with regard to the deprecated API so make it more prominent in the documentation as it is easily missed. Pick-to: 5.15 Change-Id: Ifacac03f0e05cea141c6c4a7d88eaac609e7b712 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix build with latest mocSamuli Piippo2020-06-042-2/+3
| | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.15' into devTopi Reinio2020-05-292-0/+23
|\ | | | | | | Change-Id: I8c1fc05462e1b99b16d52e4f43b2b4b1aa645152
| * Plug memory leak when tables can't be createdVolker Hilsheimer2020-05-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Delete the query object if function has to return prematurely. Fixes: QTBUG-83913 Change-Id: I82e4ca54f95970cb4ccb3985cec5389288e23fde Coverity-Id: 21930 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 772a749c7eee1f32de75ce26ee8beb6d9cf9ff46) Reviewed-by: cherrypickbot
| * Assistant: keep text at the top visible when resizingEirik Aavitsland2020-04-222-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | After following a link to look up a keyword, resizing the width of the window would lead to the looked-up position being scroled away. This fix is adapted from the corresponding fix in Qt Creator, https://codereview.qt-project.org/c/qt-creator/qt-creator/+/274996 Fixes: QTBUG-34525 Change-Id: Ia9c2aab4b2c8039965eff098ff51dbdcc4967a01 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Doc: Fix documentation warningsTopi Reinio2020-05-201-1/+1
| | | | | | | | | | | | | | Fix documentation warnings for all modules contained in qttools. Change-Id: I787de084ef5723e9a27a525cfcd3858caa2f1c94 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Remove QTextCodec dependency from assistantLars Knoll2020-05-184-55/+14
| | | | | | | | | | | | | | | | Use QStringConverter instead and remove some code where QStringConverter provides equivalent functionality. Change-Id: I88318411d90de979f943428fb27fc3e044d9f3ea Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix language selection in Designer, Linguist and AssistantMiłosz Kosobucki2020-05-121-13/+4
| | | | | | | | | | | | | | | | | | | | | | Previous way of loading translation didn't use the proper QTranslator::load() overload. Because of that, the name of the locale was used which may be different than user's preferred display language. See also https://codereview.qt-project.org/c/qt/qtdoc/+/297560 Change-Id: Icbb5d4c94c2d627e521005dcd90a1a0de495c63c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Port assistant to use QRegularExpressionLars Knoll2020-05-096-31/+37
| | | | | | | | | | | | Change-Id: Ie512c5f80d90bb44848d7cc0959ede67d7428b7a Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* | Plug memory leak when tables can't be createdVolker Hilsheimer2020-05-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | Delete the query object if function has to return prematurely. Fixes: QTBUG-83913 Change-Id: I82e4ca54f95970cb4ccb3985cec5389288e23fde Coverity-Id: 21930 Pick-to: 5.15 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Remove unnecessary QOverloadsFriedemann Kleint2020-04-162-3/+3
| | | | | | | | | | Change-Id: I0945c5f91f76d690d2ad37ad657bdb67b2990572 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
View Lorry Controller Status