summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.0.0' in qt/qttoolsv6.0.06.0.0Qt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: Ib75763811e39344a2ce17740619f82830a3ad19a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-12-041-2/+2
| | | | | Change-Id: I857dfe56dc03abdb5f7fcf04a17c0be2f7137f96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsv6.0.0-rc2Qt Submodule Update Bot2020-12-011-2/+2
| | | | | Change-Id: I7c20febe14839baa356dbb9f2b110a919c34c081 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-12-011-2/+2
| | | | | Change-Id: Ia65f7b39c8de9bf4b3833809d8e5789c6a5e97e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-11-301-2/+2
| | | | | Change-Id: I31c71ce9dfc65496fd8a10ff514eeebf4b84fd98 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-11-301-2/+2
| | | | | Change-Id: Iafe87016a31405e9b432ec564ebecd60476a112b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use PRIVATE linkage with target_link_librariesKai Koehne2020-11-3020-21/+21
| | | | | | | | | | | Fix the CMake snippet in the class documentation pages to use PRIVATE linkage. PUBLIC linkage is only needed if the Qt types are also used in the public API of the user's module. Task-number: QTBUG-88935 Pick-to: 6.0 dev Change-Id: If4aee64a25ec8152a2a0ad5b5504f53a41d93079 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* qdoc: Fix CMake statementKai Koehne2020-11-2621-51/+51
| | | | | | | | | | | find_package() only knows about COMPONENTS, not COMPONENT. While at it, also make the find_package call REQUIRED, and do use the versioned library target name. Pick-to: dev 6.0 Change-Id: I1410b7c8cce84a1f24853bfcef650e440c468b33 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-11-251-2/+2
| | | | | Change-Id: I8803b36b6a7c5a9a6c5701ca2adc395d5f24ba22 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.0.0' in qt/qttoolsv6.0.0-rc1Qt Submodule Update Bot2020-11-241-2/+2
| | | | | Change-Id: I555348125d3e74cbb86728225a56f5ae11c993cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Fix example attributes being incorrectly appliedKai Koehne2020-11-242-2/+2
| | | | | | | | | | | | Once an example had an attribute associated - for instance isHighlighted - all the other examples afterward got the attribute too. This caused a (more or less) random list of examples to be highlighted in Qt Creator. Pick-to: 6.0 dev Change-Id: Id09c232f56328d345deb9521651af40ecf750a36 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on '6.0.0' in qt/qttoolsQt Submodule Update Bot2020-11-231-2/+2
| | | | | Change-Id: I1da3585891b8d96e4918351791eec6e3493f03cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Exclude assistant from build"Kai Koehne2020-11-237-16/+33
| | | | | | | | | | | This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d. Reason for revert: See discussion in QTBUG-86746 Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 2a41769b64c166b5a93d1046e030fe22dc0834eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add Qt 6.0.0 changes fileJani Heikkinen2020-11-231-0/+16
| | | | | | | | | | | Qt 6.0.0 is new major version for Qt and so on we don't need to list changes to the previous Qt release but guide readers to check porting guide. Task-number: QTBUG-88099 Pick-to: 6.0 dev Change-Id: Ia667f9c1241404b46f62590c5014577bd28088da Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* lupdate: Fix assertion in C++ parserJoerg Bornemann2020-11-231-1/+3
| | | | | | | | | | | | | | | | | | The parser reserves space for the the string yyWord: the length of the input string, e.g. the file. Later, it checks via Q_ASSERT whether the string is still attached to the initial buffer. In Qt6 we cannot rely anymore on QString staying attached to it's buffer for all operations. Therefore, the assertion cannot hold in all cases. Change the assertion to something weaker: ensure that the buffer size (the string's capacity) stays the same during the parser run. Fixes: QTBUG-88647 Change-Id: I62ef2598b7023bc5bbc44aa477ac3bca60d6f355 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 6f3c749f0e85c0bfd93a6d176fce2f25edf58962) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use https instead of http when opening docsJarek Kobus2020-11-233-4/+7
| | | | | | | Change-Id: I10dfbd66b2510ae23ef91a2048f1ead6ddfb588f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1d994b1471bd43d7003697b47e3f7d2ebfc808df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtHelp: update generated help filesJarek Kobus2020-11-232-0/+0
| | | | | | | | | | Otherwise, when help engine is in readonly mode, it won't be able to autofix them on startup. Change-Id: I6a6cd33252f8ae315748cad4626821036754f3b5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit e42dd32a070bcae44d60de238e07af73cdeb34d9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Assistant: Fix tr()-callsFriedemann Kleint2020-11-231-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 Change-Id: I2debf4b1dc7ef514a665f0b509257ff0313c6cdd Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 5c08a8c207fdcc27aed53478d3c082d44e4be395) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix missing qdbus.exe and qdbusviewer.exe on WindowsLi Xinwei2020-11-231-3/+1
| | | | | | | | | | Qt DBus module is also available on Windows. Excluding it from optional components of Win32 will prevent building qdbus.exe and qdbusviewer.exe. Change-Id: Id2cb4965beb8f136c62c42a80bc9b922d0ffca3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 1338e2405df3d0d03d55c68e0b804e5e7f872649) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt CMake: add target description and use qt_internal_add_tool()Li Xinwei2020-11-211-4/+7
| | | | | | | | | | | | | Compared to windeployqt.pro and .prev_CMakeLists.txt, the target description is missing in CMakeLists.txt. Using qt_internal_add_tool() instead of qt_add_executable() can exclude the Debug build of windeployqt in multi-config build for CMake 3.19.0. Change-Id: I54692875494b2d9e7de7826d3758fe78d10dbddf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6ea90064cb46470f8f5e3f12e1337ca4af4ee304) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qmake: Fix qHash-related integer conversion warningsFriedemann Kleint2020-11-203-11/+11
| | | | | | | | | | Use size_t instead of uint, following qtbase/008343a05e16081e2ed2b7f5166c6d5381a427ca. Change-Id: I98809c2208bf270835d5e55fcb28d9aeecd087dc Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b34a39904c8bb03ef37bb3d9278cde5cfb69f6ac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-201-2/+2
| | | | | Change-Id: I7bf1163abcbae02db51e61b29bf05c8692440946 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-201-2/+2
| | | | | Change-Id: If848bcd543a357f8df93e38c147e8015d1b1b502 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-191-2/+2
| | | | | Change-Id: Id82339ba7ad8dbd008b16efce82d276a384a6a8c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-191-2/+2
| | | | | Change-Id: I60799ca1aac75c328e34b525d63d257670ffc5e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-181-2/+2
| | | | | Change-Id: I7abe55bd50c414cd4d68cad89c9dc99cb1ab4164 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-181-2/+2
| | | | | Change-Id: I29daa074aa77e627fb8409d5c7945d7f2d545ec4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Document attribution argumentKai Koehne2020-11-171-6/+8
| | | | | | | | | | Attribution pages got introduced in commit d3f3e98ee. Also order the arguments alphabetically. Pick-to: 5.15 5.12 Change-Id: I14d54067b803bf6a788676a45fec7969486187be Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-171-2/+2
| | | | | Change-Id: Ib3e80631df539486885eb4aa8be444aa34de82f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-171-2/+2
| | | | | Change-Id: I2d7a01ecad35a2c2fdd6e35717162e1fb7d5d18a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qdoc: Allow \generatelist to list collections with no membersTopi Reinio2020-11-166-7/+74
| | | | | | | | | | It's allowed for a collection node (e.g. a QML module page) to have no members (QML types), and still be considered valid. List these types of pages when processing the \generatelist command. Fixes: QTBUG-88536 Change-Id: I23c890c4752039f29489a7504f73f8078fe01fe3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Update documentation of CMake commands for Qt 6 for Qt LinguistToolsKai Koehne2020-11-162-19/+24
| | | | | | Task-number: QTBUG-88530 Change-Id: I730ceccac5e5b93c93b15bc39c2c0ed6e7f4f670 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qdbus: Fix deprecation warnings related to QVariant::TypeFriedemann Kleint2020-11-161-9/+8
| | | | | Change-Id: I44113e2b8918010deb37e08120f4f702cb40b47d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* lupdate: Fix compiler warningFriedemann Kleint2020-11-161-1/+1
| | | | | | | | Add override, fixing: src/linguist/lupdate/lupdatepreprocessoraction.h:79:10: warning: ‘virtual void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange, clang::SourceLocation)’ can be marked override [-Wsuggest-override] Change-Id: I5b131bc71d1e8f7f4d3cb5fc0350cf2d54b2fa31 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-161-2/+2
| | | | | Change-Id: Ibb3ee3b44b06a505e9dfc507152ad9054b347944 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-141-2/+2
| | | | | Change-Id: Ie533bade65dda9c7f4f808eb4589d5d7a5a303a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsv6.0.0-beta5Qt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: Ibed45a9036dbdc801f0e348def02a31a12c564bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: I8be6d028392f1c6b40aa39d19e30b6b76ab6ac33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-131-2/+2
| | | | | Change-Id: I1945dd985f6a16689476272d3780574dc1edd018 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-121-2/+2
| | | | | Change-Id: I2982a6d61b4fe4c22b43f1564e12c5a19f752a7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windeployqt: Adapt module list to Qt 6Friedemann Kleint2020-11-121-57/+25
| | | | | | | | | Remove hopeless modules and add new modules. Fixes: QTBUG-88357 Change-Id: I165edc7a188314522ac7a1321be926552c744ae4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* qdoc: Handle JSON as plain textTopi Reinio2020-11-121-4/+4
| | | | | | | | | | | | The JavaScript code marker failed to handle JSON snippets; drop the advertised support for it, parsing JSON as plain text. This is OK as there's typically no types to link to or highlighting needed for JSON data. Pick-to: 5.15 Fixes: QTBUG-81596 Change-Id: I004fcbe97a66ff5a33c4c443a24d16107aacb4c8 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Windows utils: Remove runElevatedBackgroundProcess()Friedemann Kleint2020-11-122-40/+0
| | | | | | | It was used by winrtrunner. Change-Id: If24d854c6ba0514c464aa49acbe99c1a0def7fa4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Qt Designer: Fix build of the QAxWidget pluginFriedemann Kleint2020-11-121-1/+1
| | | | | | | Use QUuid::fromString(). Change-Id: I5e40c890ff7f64b7c542adc91355492ea27543cd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Qt Designer: Fix MSVC warning about integer conversionFriedemann Kleint2020-11-121-1/+1
| | | | | Change-Id: I69fcb0fdd03e2b87c4b6df6b941853234d4adb30 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qttoolsQt Submodule Update Bot2020-11-121-2/+2
| | | | | Change-Id: I6edac4a191d7da30a78ac3ca72f7dcbdc20319ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Typo fixRalf Habacker2020-11-111-1/+1
| | | | | | Task-number: QTBUG-87058 Change-Id: I822be17765f411e26f1596e29e1c8bd6573c8710 Reviewed-by: David Faure <david.faure@kdab.com>
* Update dependencies on 'dev' in qt/qttools manuallyLiang Qi2020-11-111-1/+1
| | | | | Change-Id: I7cc2f0bcae3f84b6a7d6b777a4bb7fa90a364bad Reviewed-by: Liang Qi <liang.qi@qt.io>
* tst_generatedoutput: find expected files correctlyDavid Faure2020-11-111-1/+1
| | | | | | | | | | | | | | QFINDTESTDATA(.) first matches :/. (in the resource subsystem) so this led to QFAIL("Cannot open expected data file!"); because it was looking for :/./expected_output/qdoctests-qdocfileoutput.html Not sure how this ever passed on CI. Change-Id: Ia4de8e35eb352b2c560d1fc92a1f837be0c20b9d Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* qttools: compile with explicit QChar(int)David Faure2020-11-116-7/+7
| | | | | | | | | | Notice how this caught a bad bug: the code was generating "listitem\001" instead of "listitem1" It seems no unittest covers this, they all pass, still. Change-Id: Ibb22231c9dc3e61d3ea0a84894e451c621d50121 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
View Lorry Controller Status