summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4' in qt/qtactiveqt6.4Qt Submodule Update Bot2023-02-211-1/+1
| | | | | Change-Id: I5df3af3c3c8eb65f553f4fe6e2efa1d12247e957 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-02-131-1/+1
| | | | | Change-Id: I0fb070b8d43ebae6b6c20a016979f8aee45d860c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-02-101-1/+1
| | | | | Change-Id: I32dc7bba3866fda376130e45b634448e725cadb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-02-021-1/+1
| | | | | Change-Id: I9892024a7c3237291b7f286abf8dae18b64969a8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-311-1/+1
| | | | | Change-Id: Ifcf3135ddc0c5a2287554bc12ac06e450b50dae7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-251-1/+1
| | | | | Change-Id: I43f035530373a2f6600780e47328e8ef3d9429c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-241-1/+1
| | | | | Change-Id: Ie1b5e9b1d3b693809ae76462c0f6d843fd41bbd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-231-1/+1
| | | | | Change-Id: I5883cd579ca6222f23a7a84fece333c1a0706925 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-201-1/+1
| | | | | Change-Id: Ib2c9018a5de4679c773203100053477d9151559b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-181-1/+1
| | | | | Change-Id: I51a9aa74480c3c09d95751f5e2d4ac6ec00019f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-171-1/+1
| | | | | Change-Id: Ie82d536324e7e5d2f77788632ce73659c7f23e81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-161-1/+1
| | | | | Change-Id: I7f72b98742e7dfe538c8cd5017b0f5046c2a762b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-131-1/+1
| | | | | Change-Id: I7b4b47d5614db42ca286cbcec763bb11270c3acc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-091-1/+1
| | | | | Change-Id: I702f553c68e406cc3f4c4b74e04b5f3c62f8d169 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-041-1/+1
| | | | | Change-Id: Id24a2f38da02fd15797d159b426c36b9ea3188ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.3Jani Heikkinen2023-01-021-1/+1
| | | | | Change-Id: I7526ed3e6c7f45138f7dead8a6d2f502942a53fa Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2023-01-021-1/+1
| | | | | Change-Id: I8edc179e6e7629b12f949c529f8eb342bed470e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-12-291-1/+1
| | | | | Change-Id: I0a6a51e8d4c850fac75dfa088d3f0f19be6ebc45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from <cctype> toupper() to QtMiscUtils::toAsciiUpper()Marc Mutz2022-12-233-5/+9
| | | | | | | | | | | | | | | | | The C toupper function is locale-dependent. Given the right locale (Türkiye, e.g.), toupper(i) is either - İ (LATIN CAPITAL LETTER I WITH DOT ABOVE; if representable) or - i (unchanged; if it isn't) Both results are wrong for the use-cases at hand. Task-number: QTBUG-109235 Change-Id: Ia9726f0079c5f2625d97a341836b3d4505db6be1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> (cherry picked from commit 09b4615abcdbef7087bb9862a3e73f3bb7930768) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-12-201-1/+1
| | | | | Change-Id: I98f9b07e14f61cf28f7be532d27702e4174146a8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-12-171-1/+1
| | | | | Change-Id: I8f36248d7f73aa94539d7e6a4c402694cb4a8f4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-12-011-1/+1
| | | | | Change-Id: If752ffa1217bbfc972a0635ed82d4bdb8bfd7d92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-11-211-1/+1
| | | | | Change-Id: Ibabfc3b12957148b40e80da63b72e9558d8e0ac9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-11-181-1/+1
| | | | | Change-Id: I1af81b9f3e45d11de2177e262b1caecc443bc453 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-154-7/+7
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-11-141-1/+1
| | | | | Change-Id: Ia53c2dd9cfaa84c7801b430146fe02cf986244c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.2Jani Heikkinen2022-11-111-1/+1
| | | | | Change-Id: Ifa1ebc8c2d70a2469bd7a90c2c3fd85b37fe6632 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-11-111-1/+1
| | | | | Change-Id: I1e049d0d92efd1004a5dd12f870b393c1a9724e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-11-041-1/+1
| | | | | Change-Id: I82322697869af9da8c8be5ac77211a90fad0f6bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-311-1/+1
| | | | | Change-Id: I74bcd53bbed711ec5f3aa9cc9cf5c1ee8a8bc487 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Fix "no rc file" case when running idcAlexandru Croitor2022-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In case if no rc file is present in the sources of a target that has qt6_add_axserver_library called on it, the build would fail with unknown command when trying to run the "echo" part of the command. This happens because cmd.exe interprets the echo and its argument as a single argument, despite the space between then. Use $<SEMICOLON> in conjunction with COMMAND_EXPAND_LISTS to ensure the echo and the argument that follows it are split. Also remove the extra quotes which are not needed. Tested to work with powershell and cmd.exe with CMake 3.16.9, 3.17.4, 3.18.4, 3.21.2, 3.24.2. Amends 2b8681267a1f79734b379b7d7776c520de7be5b5 Change-Id: If81f7f6947e35709ce4cf1a0333247fb238cf73a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 1908117dbbb1e51fe74baac0c0a0d3423bc41152) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix idc in-tree example build when using CMake 3.24Alexandru Croitor2022-10-281-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using CMake 3.24 to build qtactiveqt with in-tree examples, the build would fail with 'C:/Users/qt/work/qt/qtactiveqt_build/bin/Debug/idc.exe' is not recognized as an internal or external command, This seems to happen due to a combination of things: - using CMake 3.22+ - Windows -debug-and-release (Ninja Multi-Config) - excluding the idc tool debug variant from being built with EXCLUDE_FROM_ALL as part of a regular qt_internal_add_tool call - using add_custom_command(POST_BUILD) instead of (OUTPUT) - using $<TARGET_FILE> generator expression in the command instead of just the target name (due to having to prepend an environment setting shell script) Fix this by wrapping the relevant $<TARGET_FILE> arguments in a $<COMMAND_CONFIG> generator expression, similar how it was done in 97b1062674283afb0131e73d8319c95aa7087a8b for qtdeclarative. Note that in one case, we split the $<IF> expression into sub-expressions, and wrap $<TARGET_FILE> in $<COMMAND_CONFIG> only for the tool path, because $<COMMAND_CONFIG> can only wrap the outer-most generator expression in an argument, according to the docs, and we don't want to apply it to the target and output tlb file. Task-number: QTQAINFRA-5044 Change-Id: Ib5daa3b7c7d40761a42e5772add69c700752a6e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit fe41d5656f9c9494499061ccc0eb8d076de0e1f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Use new _qt_internal_get_tool_wrapper_script_pathAlexandru Croitor2022-10-281-10/+18
| | | | | | | | Change-Id: Ic62239033a5a291b7b33b2add460089e4302b8f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit a617b92d60c073a2d5ac89da73f73b9a0a309154) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-271-1/+1
| | | | | Change-Id: Iaadd0bbfbe5aca403d8909cc39aba49ead810ce0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-261-1/+1
| | | | | Change-Id: I00009e1a876846f1056a2b89c6c96c5796266edc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-241-1/+1
| | | | | Change-Id: Id5397e43627ae2de719f9a1e316fc74c754169a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AxServer: Accept unconventional IDispatch calls from pythonVolker Hilsheimer2022-10-211-4/+13
| | | | | | | | | | | | | The win32com python package calls IDispatch::Invoke for property setters with GET|METHOD flags, but only in-parameters set. Recognize that and add the PUT flag to indicate the special case, which allows us later tolerate such calls when unwrapping the in-parameter. Task-number: QTBUG-106024 Change-Id: Ia49bd0fb575f50a7a8c1f9d5f1bc09b3547256fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 75994086898237cc9199d4619c3cfd2424c28e52) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix returning QAxServer objects from methodsVolker Hilsheimer2022-10-211-2/+1
| | | | | | | | | | | | | | | | A QVariant initialized from a QMetaType is valid, but null, so in case of pointer return types we didn't update the QVariant that would then be written back into the return value. Always write back if we have previously recognized that we are dealing with a pointer return type, indicated by argv[0] pointing at the argv_pointer array. Task-number: QTBUG-106024 Change-Id: Ic1bd258b006746e0233c09fe68842bdeefdfc84f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 201d40e4daafa7fd6f2d8f4237f393847550052d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-201-1/+1
| | | | | Change-Id: I1d7c9a8749d3836cb08b3e0a9aa9cce696f7a1ad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AxServer: Fix retrieving IID_IAxServerBase from IUnknownFriedemann Kleint2022-10-191-11/+25
| | | | | | | | | | | As suggested in report, do the same for VT_UNKNOWN. Fixes: QTBUG-106014 Change-Id: I09ecd5895a0caa409eed237e551af2a1fafdad00 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit f735057e8b5b92f8b744a1d8d22e2c5e355ee20f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-191-1/+1
| | | | | Change-Id: Ib3a1cba2b93dc9f01f27902dbf821b9ab48a3f15 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-181-1/+1
| | | | | Change-Id: Idea9a9768486bd2d67db152859f6de41058bd47b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-171-1/+1
| | | | | Change-Id: I1ba305ae5bb98c927c27e130a263bbd4b083ddba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-141-1/+1
| | | | | Change-Id: I2019cf660268995f57401547e4a75e709ecfbb9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-121-1/+1
| | | | | Change-Id: Ie5adad6cd474935fc3b11c995968b276c6cfe973 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-071-1/+1
| | | | | Change-Id: Ia2e78f9cf4374db784d8e68072ad07a85767277d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-041-1/+1
| | | | | Change-Id: Ib5aaefbf3b4e221fb20a111a9cfcea642e9f0e2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-10-031-1/+1
| | | | | Change-Id: I7b7274544bb95944ac7efe9f8d06b18e52828fd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-09-301-1/+1
| | | | | Change-Id: Ib3b0453734cbd1149636c2f65512bb5a6f5aaef2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-09-291-1/+1
| | | | | Change-Id: Id5d24269a1d8fed1e8c29f670f77d55de42998e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 04:23:24 +0000