summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtactiveqt6.2.0Qt Submodule Update Bot2021-10-041-1/+1
| | | | | Change-Id: I8e70ab714ef66f59d4a7b6dd5502ab7356aeaab3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENTIikka Eklund2021-10-031-1/+1
| | | | | | | | Current value should be empty to reflect the branch status. Pick-to: 6.2 Change-Id: Iaf03dde149b1bfbaa108be1bdff4fde2cc43d10f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.2.0' in qt/qtactiveqtv6.2.0Qt Submodule Update Bot2021-09-241-1/+1
| | | | | Change-Id: I994a188a5667b24d982d58dd9ad71cbb66ba5e87 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-231-1/+1
| | | | | Change-Id: I8cc13d7befc7c3a35a5e0288e22530493c8ca70f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-211-1/+1
| | | | | Change-Id: I5d12e7033c426109694d14d481f67b0a1a6ac4af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtv6.2.0-rc2Qt Submodule Update Bot2021-09-211-1/+1
| | | | | Change-Id: I773257cbebfc2f8423e08bede3a30f762e74cf7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-191-1/+1
| | | | | Change-Id: Ic282c94d5210de50b898cf1ed22ff583deb3d6d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtv6.2.0-rc1Qt Submodule Update Bot2021-09-131-1/+1
| | | | | Change-Id: I6e7b3dc84e7f62c632658da300c64cbfe91bd41c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-111-1/+1
| | | | | Change-Id: I04ce30dc82e9e15041bec7793a91faa1f7103c38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-111-1/+1
| | | | | Change-Id: I59fa458e11b678e8702ac671aa7ebc8aba223651 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-101-1/+1
| | | | | Change-Id: I6d9d3c6b07b8933d398df647e723ff6af4936e64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtactiveqtQt Submodule Update Bot2021-09-091-1/+1
| | | | | Change-Id: Iab93cbbe4ef583f967f0f82a7a0974f1a584d117 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-081-1/+1
| | | | | Change-Id: I70dce0d39358d65e38f1289d5284bde3892ce780 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-071-1/+1
| | | | | Change-Id: Ib307d2c3c7dcdb3ab17cfebc66596cc7f3a9aa11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-061-1/+1
| | | | | Change-Id: Id127d994aa6cbb42a123001d6617133869efb59c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Ensure versionless wrappers do not introduce a new variable scope"Craig Scott2021-09-062-8/+8
| | | | | | | | | | | | | | This reverts commit d7cb318f41686f7a43f67d8af0b0539b9dd8f78c. Macros add another level of escaping that functions do not. The conversion of the versionless wrappers to macros may alter the behavior, so revert that change. Task-number: QTBUG-96219 Change-Id: Ic0df7dc9f9fd2893ed14037ffa0cc4ab57aee4d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 5a4fb366d486d8e6de1f2944a2d0a6b0b6893863) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-041-1/+1
| | | | | Change-Id: I3e59a90a425fd2cd49149281c29f2408eedb667e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-041-1/+1
| | | | | Change-Id: Ib45ff01e8eea4011b46b4800c71742bf94ad64ad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-041-1/+1
| | | | | Change-Id: I1dc52ff2b9128d448cd3cdeef9dab1f3fc8cc077 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-031-1/+1
| | | | | Change-Id: I79cd3dbe7e77c5bbaf4dc16ad294ec181055b4f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: Id320d7fbaaa5695e3fb9e3fac524e948a949afff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtv6.2.0-beta4Qt Submodule Update Bot2021-09-021-1/+1
| | | | | Change-Id: I05de65f7a5cca17fcbe921a1a51fd3f9d175f84b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-011-1/+1
| | | | | Change-Id: I47e415370a6fed86668284ab02e4c4804c1da14a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Ensure versionless wrappers do not introduce a new variable scopeCraig Scott2021-09-012-8/+8
| | | | | | | | | | | | | Using function instead of macro prevented the wrappers from being able to pass back any variables set by the wrapped function in the calling scope. Prefer macros to avoid future changes which might do this from silently swallowing such variable setting. Task-number: QTBUG-96121 Change-Id: I77f924009b2eae41d89fdc09a2b72eece0937f09 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d7cb318f41686f7a43f67d8af0b0539b9dd8f78c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-09-011-1/+1
| | | | | Change-Id: I2628923ebed3c01682a49ea1d6671c9b6ef13eef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-311-1/+1
| | | | | Change-Id: Ie2d8c984003baf60177c740674d4140a7b39f876 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-261-1/+1
| | | | | Change-Id: I5c6784604a437d67f18cb7dd474c39d51b011c23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Conan: Inherit recipe class from QtLeafModule for common functionalityIikka Eklund2021-08-262-76/+18
| | | | | | | | | | | | | | | | The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Task-number: QTBUG-94816 Change-Id: Idb08326dc13b90b2a70db3a2f53e5a4d4a348adb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit c49ae50dc3bb0cf4235c85333a42fb5b91962a2f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-201-1/+1
| | | | | Change-Id: I713da916781c0abc04079d876c25e332905529a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-191-1/+1
| | | | | Change-Id: I9b7f5347fba0afe085bfca5685b76dc43a966f45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-181-1/+1
| | | | | Change-Id: I2200aab7ff44976d23ed0322fc1cf36ee25f01e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-171-1/+1
| | | | | Change-Id: Ib3c7f0539b338babd320928668a52ffbae4bb1c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-171-1/+1
| | | | | Change-Id: Ibe901ef717d6dc322652bb5d599fffdd21065319 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-161-1/+1
| | | | | Change-Id: I801c5f75786d7457e5eb3ff45944da42849f756f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtv6.2.0-beta3Daniel Smith2021-08-121-1/+1
| | | | | Change-Id: Ibf8309801820f9f9f4a83f97d6f65aa193240f7a Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-101-1/+1
| | | | | Change-Id: Ife9da37ad3ef884b5bde8c65f4f4c14742f85aef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-08-041-1/+1
| | | | | Change-Id: Ie45366f19e318f5ca887203923886957169ec2d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disable server examples for MinGWFriedemann Kleint2021-07-301-12/+14
| | | | | | | | | | | | It is missing the midl tool. The .pro file was incorrectly ported; its last line clear the variable. Fixes: QTBUG-95406 Change-Id: I157b5c032e506b9481f1af1ed8153506b40cd79d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit b7e91572aacfbba55c50a786caedafac1a1f139c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-291-1/+1
| | | | | Change-Id: Ie7f40584bc6b7035b533123ff60d1cbf129e458d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix type library UUID regexAlexey Edelev2021-07-282-4/+10
| | | | | | | | | | | | | CMake doesn't support regex quantifiers, so need to multiply the number of hexadecimal numbers manually in UUID regex. Add missing LIBRARIES argument to qutlook example. Fixes: QTBUG-95407 Change-Id: I3f3da1e29fe524ed7f03b3764de9139c4fc13a5b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 934bb86f9bb6c8f36e87097c8d74effc13e08f10) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-281-1/+1
| | | | | Change-Id: I52e3e068e76ffd611d64c24db240cf695e0529a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtv6.2.0-beta2Qt Submodule Update Bot2021-07-241-1/+1
| | | | | Change-Id: Ie40f86984f43e5d92fa8a9d8c7558e5c14e4b662 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-241-1/+1
| | | | | Change-Id: I20c57d740b34fd8ba639b953d1edec8bf0828a3d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-231-1/+1
| | | | | Change-Id: I5d95b12c409e8ac473ca7abbab683cc78f335609 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-231-1/+1
| | | | | Change-Id: I9bc5f1a8802ce821fe6af533d09f82457dfda163 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: I98e1cf01a671e091c038be3c48b65af36ef36868 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: Id1c8e3b9bcd64e3591d3269b537d82e8fe5958c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-211-1/+1
| | | | | Change-Id: Ic9ff24cc7bcf9ed9575392c792d6c70a3801a094 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-201-1/+1
| | | | | Change-Id: I85808004466ae15c543982ecc0cca6b685d05a86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtactiveqtQt Submodule Update Bot2021-07-201-1/+1
| | | | | Change-Id: I9d8f473b108891830717bea15ac728c059f6e780 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>