summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qttools6.1Qt Submodule Update Bot2021-10-011-1/+1
| | | | | Change-Id: Ia5832cc6d684a09021b864b300ba1a6ef8e1906b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-291-1/+1
| | | | | Change-Id: I46f62c60cf12e33d80b88eb0e0f267377138472d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-281-3/+3
| | | | | Change-Id: I986388a6755c6052df7b858b5306bb28213648a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-231-3/+3
| | | | | Change-Id: I5009e5877009baf134c08d5b5a1e1399bafae368 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: Id4b213affd4680e6a7c5c12d2740a2b856b38fb6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* macdeployqt: detect debug libs by using “_debug” suffixMorten Johan Sørvig2021-09-091-1/+1
| | | | | | | | | | | | Use endsWith() instead of contains(), which will not give a false positive for internal usages of the “_debug” string in the library name. Task-number: QTBUG-90982 Change-Id: I22258ab2cc59e36d13fcdc078fcb2ad6381de102 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit ac79993e7f0f4cca37aac113ebddfedc470e7153) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* windeployqt: Fix deployment of tls pluginsJarkko Koivikko2021-09-061-1/+1
| | | | | | | | | | | Since Qt 6.x the bearer plugins are gone. Reuse that entry for tls plugins. Fixes: QTBUG-95247 Change-Id: I68f8b20942375b124ba9859c23f1b1c770ab406c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit cd8a01945c47956913739fadd047b5948cf89fed) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix extensions without leading period having first character droppedCraig Scott2021-09-061-1/+1
| | | | | | | | | | | | | The list(TRANSFORM ... REPLACE) regular expression was malformed. CMake string parsing requires backslashes to be escaped if they need to be preserved instead of treating them as escaping the character that follows them. Fixes: QTBUG-96220 Change-Id: I61d46cfb7ed32fd97c49e15a1f58a055f12e596f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 581fc31c54aaa06af16c2047808a29be1a8d3239) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: I409af508ccfccade83c0707fd16d764ef5ec9097 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Binary compatibility files for 6.1Milla Pohjanheimo2021-09-033-0/+61529
| | | | | | | | Binary compatibility files added. Pick-to: 6.2 dev Change-Id: I01796815186baf828e626b54ce417972a64a9b38 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-09-031-3/+3
| | | | | Change-Id: Ic323a2746244b4eab05ef88cda6ac6757c8d79f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-311-3/+3
| | | | | Change-Id: I0af9fe5fee785c9915060750194436e6933cfbdb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-301-3/+3
| | | | | Change-Id: I0538b3b6ebc27db32d421405567419f608f78f5a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* macdeployqt: deploy plugins also when QtCore5Compat existsMorten Johan Sørvig2021-08-271-1/+2
| | | | | | | | | | | | | | | | macdeployqt determines Qt's libinfix by examining the naming of QtCore.framework, looking for the infix between "QtCore" and ".framework". This worked well until we added QtCore5Compat.framework. Add check to make sure we don't pick "5Compat" as the infix. Fixes: QTBUG-94796 Change-Id: I79b355c19e3826fe1e2a3677e8ec26e1abada11f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 40b329a4b312add7951ddb826ad28eb43c576042) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* macdeployqt: fix network plugin deploymentMorten Johan Sørvig2021-08-251-1/+1
| | | | | | | | | | The bearer plugin is no more; the tls implementations are now proper plugins. Change-Id: I153e425164089c6d26a0ca642c86c231bb728509 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit cac228499e9456a1e661aced071b65bfd183f3d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Remove mention of custom filters, part 2Kai Köhne2021-08-252-22/+0
| | | | | | | | | | Amends 235bbe3f939ce4b44b844ec67389c8a71ceceea5 Task-number: QTBUG-91082 Change-Id: Iade5289503d2c17e849eca1dfe2641aac70d8cfd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fff99c6e97a094f2fed0a4fa56d3d74800e9c85c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-201-3/+3
| | | | | Change-Id: Ic42dcddf2e0247d922213a8bee5e182078b0dafe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-181-3/+3
| | | | | Change-Id: I74bfb2f4a3170f616860e7794b5cff14e966c16e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-141-3/+3
| | | | | Change-Id: I1d67a8004d69528f9486a329a1707aecb4e227aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-131-3/+3
| | | | | Change-Id: I6dfc25b8c493f077f9cc1fc69d5d88853e96176f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-131-3/+3
| | | | | Change-Id: Ib78e77e5ce372a6b0c315586ff93b8e726cfb4cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-131-1/+1
| | | | | Change-Id: I8382ca86d3680795baf452d01e230476edb8783b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-121-3/+3
| | | | | Change-Id: Ifcbc9bf161cce857c7f0df225b27d911de6cae12 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-091-3/+3
| | | | | Change-Id: Id71d49a1c2104bbab259c6c2ab563fb7b7503b2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-091-1/+1
| | | | | Change-Id: I914ae841a83d111c0f5ff69a84a2c3c76b8b2c13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-061-3/+3
| | | | | Change-Id: I3a3c3784e1b75a247f93004eb09e916ebe06de7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* windeployqt: Account for debug version of ICU library when deployingAndy Shaw2021-08-061-1/+12
| | | | | | | | | | | | If windeployqt is deploying the debug version of the libraries and the used ICU package contains debug versions of ICU libraries then the debug version of icudt should be included as well. Fixes: QTBUG-87677 Change-Id: I43266f9d65feacfd22c26de1008976bda001b481 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 8c6f62b9c26f6fb42fff185e702d365ab18bd1c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix a typo in the "Introduction to QDoc" documentation pageLuca Di Sera2021-08-041-1/+1
| | | | | | | | | | | Changes `thinks` to `links` in the 4th paragraph of the "Why Standard Mode Is Slow" section. Fixes: QTBUG-95561 Change-Id: If49f2d58341f33adf8cb8504193d7e3cb3896fcc Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 07164bb6a5bdea6cacd69692287bd65a592b2f5a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-031-3/+3
| | | | | Change-Id: Icf506788be921b4e1678843fa0efbea69e60188d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-08-021-3/+3
| | | | | Change-Id: I55fcd6b75fef13d636f20b03aaf5fd0334c9932e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-08-022-2/+2
| | | | Change-Id: I0fb39a2f02507fa5f549043c8556c3e0dd24fc5a
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-301-3/+3
| | | | | Change-Id: If09324cc29f25e1f6c2abc07ed6dd0f76fdc7b2e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-301-3/+3
| | | | | Change-Id: Id8b1490ae71c0fb34387351fdfa37ab7df6f2b3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-231-3/+3
| | | | | Change-Id: I583373e06628f4d3e3c2ef4da4e12c3a8a1b7100 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: I21a29e6e5ade84a634ab93dfd8d9454d49d001c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-221-3/+3
| | | | | Change-Id: Ic920de99ce069392a1c9c0aa2f158720a923ce0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: I80317b2da6673d679f9a51893dd2b060bce0ab53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: I3e3be6e06d0f474c0fe7495eb3fa31c9391c087b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-211-3/+3
| | | | | Change-Id: I5464dbff3327cdecdedae3eac9865b2ceb094505 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: I044b867d3206d169a0616ba4d35251798cdd8597 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-201-3/+3
| | | | | Change-Id: Ieef308f5be9e705c372ad80ee62a53cbd5b93a82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-161-3/+3
| | | | | Change-Id: Idce7cf10bd19b7e82f09ab089af0be018b908317 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: I538dea7bf979e4f50c39df49443c42aef3071902 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-151-3/+3
| | | | | Change-Id: I8af9487c3a464540b86c12b0e3c9260350c5e377 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-151-1/+1
| | | | | Change-Id: I3d1a4fc3e76e3b51695129528566d9a9f75d2764 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-141-3/+3
| | | | | Change-Id: Iac306544a66a9b8a007c7dff67cc8f2eb99ccb9a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-121-3/+3
| | | | | Change-Id: I1c7e05af2d18e39b073eda51e3c7ffe099748597 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-081-1/+1
| | | | | Change-Id: I02cea20c70bb7dd2deac2f173b702e02cad188ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-051-2/+2
| | | | | Change-Id: I8365f0a604f1d91e3e6ab3d410578cd07a4b64f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttoolsQt Submodule Update Bot2021-07-011-3/+3
| | | | | Change-Id: Ibf9d72b64c68e1f0186004be8a6a157f465c6069 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>