summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-191-1/+1
| | | | | Change-Id: Ib66ad3ff541263b0480dd014001b472597c459be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-151-1/+1
| | | | | Change-Id: Iec8637b49d042b46fd3940c7d90890dd6de2f05e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.1Jani Heikkinen2023-09-151-1/+1
| | | | | Change-Id: Ibdcab802ebd94105a31b91d9a4ee47fc1c7989b4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-121-1/+1
| | | | | Change-Id: I83e2dd8c0f2b894e6d3f201163202222cadeabd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtv6.6.0-beta4Qt Submodule Update Bot2023-09-091-1/+1
| | | | | Change-Id: Id1cd0b38d6069184a9c66053dc70f36c05a5088e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-081-1/+1
| | | | | Change-Id: I19b174547dd7e45ccddf2fb82722974c3431db7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-071-1/+1
| | | | | Change-Id: I703d841ad08eb96fd32e998ffa21292750bc2e3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-041-1/+1
| | | | | Change-Id: Ic6ff6ffa2f40b4dc571c184869737c9d5456833c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-09-011-1/+1
| | | | | Change-Id: Iaf004eb16314471129d5ce0f52c86c34d6d93a29 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-301-1/+1
| | | | | Change-Id: I8b76e3c71a112301e1151e22f628b2342dbac80a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-291-1/+1
| | | | | Change-Id: I414ee93d02e1b96d3cd50ba09e635e1f477dc791 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Mark QAxSelect::SandboxingAppContainer enum as new in Qt 6.5Kai Köhne2023-08-281-1/+2
| | | | | | | | | | Amends 55876d1b4e6a, 12f159f85bf02 Change-Id: Ie5b0b8f472243d92c62e5ce5ca64210d4771c8b9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> (cherry picked from commit b14c2c2151e845b2c6eea4aa804f485c4376811d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-281-1/+1
| | | | | Change-Id: I3684c5960a9b1104ddf377b2b25f03000b8a34b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-251-1/+1
| | | | | Change-Id: I20cb0c90c0caee5ff51c49e67752527457f0d2c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-241-1/+1
| | | | | Change-Id: I8fd8ae009bd03d16268ead5618a9d16c2a082cd3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-221-1/+1
| | | | | Change-Id: Ieecc2823c6afc0764e25e7bab95a127cbeb06ae9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add example categories for Active Qt examplesMats Honkamaa2023-08-214-0/+4
| | | | | | | | Task-number: QTBUG-116039 Change-Id: I171566bea939dc6a801e5b3dc441b814693d8d79 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit ba7dbbb71165b9c3c2ba6a679075f1dbb2e37280) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-181-1/+1
| | | | | Change-Id: I31715e8767b61ce8ed37f3ebafc84ab860487469 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtv6.6.0-beta3Qt Submodule Update Bot2023-08-161-1/+1
| | | | | Change-Id: Ie7ef807737430f07066adb08fb5de5f39f5f12a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* [ActiveQt] qutlook sample crashes with distribution listsJøger Hansegård2023-08-151-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | The qutlook sample may crash if the contact list contains items that are not regular contacts, for example distribution lists. The crash occur because items such as distribution lists do not have the requested properties (FirstName, LastName etc). This patch works around this issue by checking if the contact list item is a contact before attempting to access the requested properties. A side effect is that non-contact entries show up as blank lines in the address list. In addition, the patch fixes an issue where the qutlook app crashes if creating the Outlook COM server fails. This was related to an uninitialized variable (AddressBookModel::folderItems) Task-number: QTBUG-111191 Change-Id: I6abfdaba4a49ef85bc245b26779b8bfdc409887b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 58a3cfe8574550872d47d7e08ae9b62e3b99bfd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix issues that caused ActiveQt qutlook sample to crashJøger Hansegård2023-08-155-9/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issues reported on qutlook sample appears to be caused by previous hardening of the QVariant type, which now does not accept copying uncopyable types. The fix to this problem seems to be to be more consistent on use of pointer types (which are copyable), vs value types generated by the dumpcpp preprocessor. In the function VARIANTToQVariant, we may end up in constructing a wrapper object on top of an IDispatch interface. To be able to construct an object, we need the value type of the wrapper object. Still, we should pass it out as a pointer type. This change ensures that a pointer type is returned if a pointer type was requested. A second similar issue is fixed in QAxBase::internalInvoke, by passing (what I assume is) the destination type into VARIANTToQVariant. This prevents decaying pointer types into value types. I am not sure if this is the right approach here, and it leaves the decay code behind, which now might be unused. Task-number: QTBUG-111191 Change-Id: I0331ee5e3f2dbeed2db45e152378c223feb6fc94 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c92c897a700492878b767af7e10074e236b39f92) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-151-1/+1
| | | | | Change-Id: Ie3badc355c54a2633742a758b9a8b6b82c996114 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-081-1/+1
| | | | | Change-Id: I29596f9bcced556cf862ce74c9ac5c23cc8026be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-08-021-1/+1
| | | | | Change-Id: Ia0ea8a3d454bbb57fc300b2eedd2728345cb559d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-07-311-1/+1
| | | | | Change-Id: I378ca4030363d8aeeb21517354c1868c04a356b4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-07-261-1/+1
| | | | | Change-Id: I8a1d9880f860240e559735cc83d6c7553d63eaea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-07-211-1/+1
| | | | | Change-Id: Ic188016df7f76342285df9631ccf8cef96c61ecd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-07-121-1/+1
| | | | | Change-Id: Iad78b529bc3f66ac098fcb1ad8e9140088e3c417 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtv6.6.0-beta2Qt Submodule Update Bot2023-07-071-1/+1
| | | | | Change-Id: I24ca6e78e5df5adc452f4a3c5deb7045325358d5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-291-1/+1
| | | | | Change-Id: I50decc96365520f1274ae4ef8a3d6ccec95b5642 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Document that unloading in-process Active Qt may cause crashJøger Hansegård2023-06-281-0/+7
| | | | | | | | | | | | | Statically allocated Qt resources created by an Active Qt COM server may become corrupted after unloading the COM server dll, if Qt modules other than those found in QtBase are used. This change adds a DOC warning about this problem and suggests a workaround. Fixes: QTBUG-56172 Change-Id: I0b6afd92f24c50ad452d2f0f7b7db53bed78e411 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c903b4948589fc94ef9a0dbc2ef675957f65d2c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: remove ActiveQt Dot Net exampleJøger Hansegård2023-06-2818-1410/+0
| | | | | | | | | | | There are now better examples for .NET/Qt interop available, making these examples obsolete. Also, the Dot Net example could not be built with VS 2015 and later as they depended on the /clr:OldSyntax switch. Change-Id: I235477d9c70b572814e8057316da26c320f42ff3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4584dbdd7ebcd0a2087b335470585c366e30fb90) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: remove links to removed examplesVolker Hilsheimer2023-06-272-12/+6
| | | | | | | Change-Id: I8b60c7b5585bd3d9d577da92074ce7ef2219d00a Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit c49552f22e59eac13392f38d9bc8f0085bff172a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-211-1/+1
| | | | | Change-Id: If6dc200b63cf25f8ea3abb19b8ddf1afc0779aa5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add group page for ActiveQt examples and tutorialsAndreas Eliasson2023-06-2011-0/+19
| | | | | | | | | | Gather the ActiveQt examples in a group page, which can then be used as a landing page when linking from elsewhere in the docs. Change-Id: Ib9840a790ea9caf93221440c8f8601162e110f14 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 6af1e5c5599d431a44c11f49529b55c32af073b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve test coverage of COM VARIANT/QVariant conversionsJøger Hansegård2023-06-194-10/+691
| | | | | | | | | | | | The code responsible for converting between COM VARIANT and QVariant is complex, and having better test coverage can help prevent regressions while fixing bugs. Task-number: QTBUG-111191 Change-Id: I804175cda91b77f95cf7ede03717f3a812d636bf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c5bb9b1051084bbe65ca5e8bf184e399434f8513) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add CMakeUserPresets.json to .gitignore in ActiveQtJøger Hansegård2023-06-191-0/+1
| | | | | | | | | | | | | | | | The CMakeUserPresets.json file can be used to simplify configuring Qt, particularly with tools such as Visual Studio and Visual Studio Code. As opposed to the CMakePresets.json, the CMakeUserPresets.json should only contain user specific configurations, and should never be checked into source code management system. This has already been added to the top level repo but to ease working with ActiveQt as a module, it should also be included here. Change-Id: I1c0139711aab414dfd07b34623d9356ede523bc3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c90e1cd72b82b5425942b980e159b3e3aaf34c61) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-191-1/+1
| | | | | Change-Id: I00e5eed4ac9920ab6e075691f7867bbf9bd24be2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-151-1/+1
| | | | | Change-Id: I82d6fbfa1cdde273c8b46cc572b1ec9e9ac8bcba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtv6.6.0-beta1Qt Submodule Update Bot2023-06-081-1/+1
| | | | | Change-Id: I5f6bc878ff515a9f66f23452ab45ccee7ef624cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-31/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: Iaa6a64f95e174048e74a13d09cbea8cc99b398e4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f000c1e3201e7da951f9ca6d6d33566b88986e7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove the manual undef of the min/max macros, or def NOMINMAXAmir Masoud Abdol2023-06-062-8/+0
| | | | | | | | | | | | We now add NOMINMAX to PlatformCommonInternal target which will be linked to everything else, so min/max will not be defined upon the inclusion of `windows.h`, or other headers. Change-Id: I2d8618f1f73e7edde941b21fad1a8528c998106b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 25eecddedb54a92dc6930b24015f6c1e8da6eeb5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-061-1/+1
| | | | | Change-Id: I8bc71b93fad72bbdc4e15c50b7065cfa47c05a33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qtactiveqtQt Submodule Update Bot2023-06-051-1/+1
| | | | | Change-Id: I7fa3c47ab27ebb5b2cd19e20f1c74f89d5e09b27 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-06-041-1/+1
| | | | | Change-Id: Iae3da0f54a9d213616b88a30810c9b6d14d7c205 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-06-021-1/+1
| | | | | Change-Id: Ifbb88738a775f8031e555b8b712ae6c4418d9967 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-06-011-1/+1
| | | | | Change-Id: I468126da18b8edadbdfa2a4dcf8e1f85806791eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-311-0/+4
| | | | | | | | | The function sets the required CMake variables and policies. Pick-to: 6.5 Task-number: QTBUG-112685 Change-Id: Ib2398f46802f34631c129aa2c5c66338f7f02291 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-05-291-1/+1
| | | | | Change-Id: I0132091fa21a95a331fb27d9d94be24cc370f907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-05-261-1/+1
| | | | | Change-Id: I37cfa5ae9232e450a5207d4ba631423a1d1928c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>