summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.1' in qt/qtactiveqtv6.4.16.4.1Qt Submodule Update Bot2022-11-081-1/+1
| | | | | Change-Id: I3cc66d27ec52a7cc5e3d83e4b0f88e2a7bf2af1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.1' in qt/qtactiveqtQt Submodule Update Bot2022-11-081-1/+1
| | | | | Change-Id: I41d6a799942d219a92ffb440536dd3f52ee309fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.1' in qt/qtactiveqtQt Submodule Update Bot2022-11-031-1/+1
| | | | | Change-Id: I1c0d694727190d90891d2bb3bb557be35c57536e 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>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-09-281-1/+1
| | | | | Change-Id: Ibfb3db218bc3e6d5d39ce1afe74089622af503b0 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-261-1/+1
| | | | | Change-Id: I826690535842d8d11cfc26fade5135d05fcd633e 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-231-1/+1
| | | | | Change-Id: Ieb6fb7c8e6dd5bcde0699c585b75ff61247b36e8 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-221-1/+1
| | | | | Change-Id: Ifa9b91e9ecca89677936d49353771405ba689771 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-211-1/+1
| | | | | Change-Id: I3cc1355f00c4719baa6d9ad03de738b02e78fb54 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-201-1/+1
| | | | | Change-Id: Ib6b68d6758dcdd4bef1f9463bad3115da3d23c6d 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-191-1/+1
| | | | | Change-Id: Ib38bce1355740091cfc3d221149852efb8d8da99 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-161-1/+1
| | | | | Change-Id: I8c99f71f62026217390889a43e40fc0f83a83b01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.1Jani Heikkinen2022-09-161-1/+1
| | | | | Change-Id: I454ef79e63ba9099be9d6fec6ceba65497003274 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-09-151-1/+1
| | | | | Change-Id: Ic924bdfe215db5ac233c9ee1e43a915c9f42cd4d 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-141-1/+1
| | | | | Change-Id: Iff043d1f01a73dff6df485d2b0dac4aaeba1bd04 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-131-1/+1
| | | | | Change-Id: I4a5cb328777e86899e468280db4e91b1da5ae3f9 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-121-1/+1
| | | | | Change-Id: I3a2a3bbb16ee2fa8bfb97d1f2923b12cab39e975 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-091-1/+1
| | | | | Change-Id: I0c78da26ae601fc5d68e44d22c5006453437be30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix warning from deprecated QColor::setNamedColor APIVolker Hilsheimer2022-09-081-2/+1
| | | | | | | | | | Use QColor::fromColor instead to create an initialized color, and make it const. Change-Id: I838859562dedb079c9fc0bcfe63a50f630c197b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6586ccbbc19162c9a388af64a21653bd9f51569d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-09-061-1/+1
| | | | | Change-Id: Id9ab78dba27dd9b3db72c0d6d6f9959466fa6fd5 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-021-1/+1
| | | | | Change-Id: I6c684fda3ccd420937c15fc242bc5f845fdc11bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtv6.4.0-beta4Qt Submodule Update Bot2022-08-261-1/+1
| | | | | Change-Id: I75ea2b979c3ed9a2c28c6f93f5d4cab83faa44aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-251-1/+1
| | | | | Change-Id: Ia25dfb6f430a0b34f2cd365da58c610e22e81a96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-221-1/+1
| | | | | Change-Id: I67d21cd8f5998ebef443b83bf727e640663288ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-181-1/+1
| | | | | Change-Id: I728e53afbb27bb2e21f05b319ec4abf6add7d9ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-161-1/+1
| | | | | Change-Id: I5d953f56efad6eb80c1119db30238feb94e7631b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-151-1/+1
| | | | | Change-Id: Ieaf2f186465813f4627df1e07eb1d83fa198bb84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtv6.4.0-beta3Qt Submodule Update Bot2022-08-111-1/+1
| | | | | Change-Id: Ic9b438d8698e1cbc1db4286ec6738c8fd7266dea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-081-1/+1
| | | | | Change-Id: I2c366be19f70ae4d16a03031768fb3e7596a3d2c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-08-011-1/+1
| | | | | Change-Id: I74279479873a92a685c0c6e073ace3f77da982dc 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-26 19:02:04 +0000