summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3.2' in qt/qtactiveqtv6.3.2Qt Submodule Update Bot2022-09-061-1/+1
| | | | | Change-Id: I7a5258d19403397e80bc3ae21ad40abda1937cc4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.2' in qt/qtactiveqtQt Submodule Update Bot2022-08-311-1/+1
| | | | | Change-Id: Id20bdbca85cc31970b45b96db4243a9f2658b8ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.2' in qt/qtactiveqtQt Submodule Update Bot2022-08-291-1/+1
| | | | | Change-Id: I5d2fdf60052bb303093d8bc49c01f94440663190 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.2' in qt/qtactiveqtQt Submodule Update Bot2022-08-221-1/+1
| | | | | Change-Id: I02bd11756a6ed66d65b1c29b98575f3375712c88 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3.2' in qt/qtactiveqtQt Submodule Update Bot2022-08-181-1/+1
| | | | | Change-Id: I6cc1b1635c2653984ddb5a7517b10db6962eed77 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-08-111-1/+1
| | | | | Change-Id: I6676a26f4c56955fa691be41c5a852561111f13c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-08-091-1/+1
| | | | | Change-Id: Ie13f03f9dd5aedb5d274be5786dbfe4ed12be6f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-08-011-1/+1
| | | | | Change-Id: I76dce66af5a644b038612ff5b438df299b3befdd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-251-1/+1
| | | | | Change-Id: I0afc87103b70c8ce09cdcac2cc07e602c1b42ac2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-221-1/+1
| | | | | Change-Id: I1ace5d599322f0561389b6a235da9776200d3e85 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-201-1/+1
| | | | | Change-Id: I6b7ade18c51ccf674cb627be10e4754cc7357047 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-191-1/+1
| | | | | Change-Id: I86cf135d561949cc3ac65a548dbf0dbbf9f84a30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-151-1/+1
| | | | | Change-Id: Ic7ffb7a7c096ae9c538ad5bd9ff2a19c089d5139 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use QObject::metaObject instead of QAxBase::axBaseMetaObject in qaxbase.cppOliver Wolff2022-07-141-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QAxBase::axBaseMetaObject results in usage of the dynamically queried COM object whenever it is used. This behavior is not always what we want though. If a type library was queried for its interface with dumpcpp we should use the information from the resulting h and cpp files and do not operate on the information given by the COM object. The files generated by dumpcpp will override the virtual metaObject function. By using QObject::metaObject instead of QAxBase::axBaseMetaObject we make sure that: a) Dynamically queried information is used if no overload has been added by dumpcpp. This is the case because QAxWidget::metaObject and QAxObject::metaObject return QAxBase::axBaseMetaObject. So the functionality there does not change. b) If dumpcpp was run on a type library the types in the code generated by dumpcpp will overload QObject::metaObject. In this cases we will only use the information from dumpcpp runs. With the previous approach it was possible that we run into issues if there are inconsistencies between a user's type library and the actual COM interface. If a function was available in the COM interface but not inside the type library definitions that might have thrown off ActiveQt which resulted in calls of wrong versions. This regression (it worked as expected in Qt5) is fixed by this patch. Change-Id: I1af5ecb81f0c4ce0dc1e899cc3f019ebee575f4b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 7b3c2f06de2ef65a8d72c4d1e0b942052d2b3c12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-071-1/+1
| | | | | Change-Id: I68ea212921d942122f3a4373129de760511d2544 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-07-041-1/+1
| | | | | Change-Id: I4bf7aff525ef63e385a851c460d76446d6455f28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-06-231-1/+1
| | | | | Change-Id: Ie9941f7fc0f8eb49081da1bac12037436e7479e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Postprocess moc output to fully qualify typesVolker Hilsheimer2022-06-211-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a property is declared with a type that is also the name of a member function, then the generated code will result in conflicts and compile errors. For instance, a property "AddressEntry" might be of type "AddressEntry*" and have a getter "AddressEntry", where the type lives in the same namespace as the current class. This is reproducible with the qutlook example, which doesn't build. This issue can also be provoked by valid C++ code, but since moc has no information about which types are classes or enums, or in which namespace they live in, we cannot do anything about that problem (yet). However, dumpcpp has information about which namespace a type live in, so we can postprocess the moc output and fix the problematic code by fully qualifying the types used with the namespace they were generated in. This slows down dumpcpp runs quite a bit, but those are infrequent as the type library typically doesn't change. Fixes: QTBUG-100145 Change-Id: Id9b4656cb1ff2c319e0b87bd22b7e9399e7c410d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit a4e0ae01fdd7e9686445d9db3d62103dbbfafa91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* dumpcpp: Completely specify enums from referenced typelibsFriedemann Kleint2022-06-212-45/+83
| | | | | | | | | | | Forward-declaring enums causes problems with the moc-generated code. Introduce a variable to qaxbase storing the preformatted value string. Task-number: QTBUG-100145 Change-Id: I500353d9788e3ea20bf1cc64172ca1b640976e5e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 99c59f82575695163e45e3848a5338f2d4fadaae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-06-211-1/+1
| | | | | Change-Id: I584ca6a4210c88f9e19a02748a45dcbd3f2f8d73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-06-201-1/+1
| | | | | Change-Id: I449595a0d2ba11257591a4e5a07f94faf244c9a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* dumpcpp: Do not generate constructors with C#-only classesFriedemann Kleint2022-06-161-0/+11
| | | | | | | | | | Add a hard-coded exclusion list. Fixes: QTBUG-100332 Change-Id: I009e202349e5f1fae13bc481e998fb494d7f997c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1c55f40705ad60113941691d0d5490bea99227f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.3.2Jani Heikkinen2022-06-151-1/+1
| | | | | Change-Id: Id438e706861d424fa3055944456cbe2c0a2125c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-06-151-1/+1
| | | | | Change-Id: I87ab2cbccd4f5c0bcc4f864601ae8c0e10fddede Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QStatusBar with widgets disappearing from QMainWindowFriedemann Kleint2022-06-141-2/+21
| | | | | | | | | | | | There is code that redirects QStatusBar messages to IOleInPlaceFrame. It should not trigger when the statusbar has widgets. Add a helper function to check this. Fixes: QTBUG-99294 Change-Id: I6854f3774bc6c31e6f184cc5b677419867011326 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 428f20048a8b2648626a510c5f2c1d27ac8b273b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-06-031-1/+1
| | | | | Change-Id: I263dea646784bf3dff29975cb45d73866077e672 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-311-1/+1
| | | | | Change-Id: I5a1774b4d9cb4eed5189264fb5a78ff7c93647b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-271-1/+1
| | | | | Change-Id: Iae01ffd2c1c7a47a91192f7c12c2ba5f12788267 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Empty pre-release version in '6.3' seriesJani Heikkinen2022-05-251-1/+1
| | | | | Change-Id: I2ba367d37d37927115517e01b0b14be482cc2c7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-251-1/+1
| | | | | Change-Id: Id5fadbb66b3f79d9beee76ca554ac8654bdbbbab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-241-1/+1
| | | | | Change-Id: I40bcc827c33fb7ef9a2e892b0b33796f596b46d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-191-1/+1
| | | | | Change-Id: If06ba5f842dc6fbf2a20579f8890647a07ab902a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* dumpcpp: Modernize the generated codeFriedemann Kleint2022-05-171-6/+6
| | | | | | | | | | | | Use nullptr and reinterpret_cast. Remove unused qax_pointer variable. Task-number: QTBUG-100145 Change-Id: Icfe7cb5365b4679846bcd6bdd5cc478685910a34 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit a4cb47a8231c08783c5f89aafb54548c10fd6f78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-121-1/+1
| | | | | Change-Id: I97cdd4df70cacd03c9b39ac455ac19088edbd9c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-091-1/+1
| | | | | Change-Id: I2f2614933fa7bf13ffe85d072bf61191672df9bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-041-1/+1
| | | | | Change-Id: I939ae9a393d631feebb197ad358933329b6a8fa1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-05-021-1/+1
| | | | | Change-Id: I5211152ae9b15afc0d59937385e9dab3e56a2eea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-261-1/+1
| | | | | Change-Id: I4e7db3cfe72f043602e6e63a418302589d80077c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-201-1/+1
| | | | | Change-Id: Icf0cc82185bae22939b405327ba16203fd8a5383 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-191-1/+1
| | | | | Change-Id: I20097e57eab33f5b59f024ec2c6ba400e7795abd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-181-1/+1
| | | | | Change-Id: I13e4b385e65fd7c8ed6d0352d1998f2845823874 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-141-1/+1
| | | | | Change-Id: Icf6b7d4d1f21cc95e38586f8874c403033183cfe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-111-1/+1
| | | | | Change-Id: If6596e92e72e8e9ddfa8fae883f2b784fcb29aa6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-081-1/+1
| | | | | Change-Id: I1cba4f65251978731234cd34d276973e8013ec9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-061-1/+1
| | | | | Change-Id: Ia6cff642df60d1beb8c2f57d3c911960fd11c5e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-04-011-1/+1
| | | | | Change-Id: I1b61a5bc31493e878671a82b69fe241a8b0ebeb3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtactiveqtQt Submodule Update Bot2022-03-301-1/+1
| | | | | Change-Id: I85b6568c53b8b1861d74d2ec4dc2531356f3a531 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.1Jani Heikkinen2022-03-301-1/+1
| | | | | Change-Id: I5928c43b080462cc6706e59021a0bf7bf12bf58b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Revise Active Qt module landing pageAndreas Eliasson2022-03-282-68/+101
| | | | | | | | Task-number: QTBUG-100369 Change-Id: I0dbd1cdca5e9a0ec244656f3306ac988c111b0b4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 45e434b69dea9aaca97a7c9efb6fff576e32c471) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-221-17/+0
| | | | | | | | | Amends 4d528a06c21811b Change-Id: I938f857fe036fb84544f7ef26284fc714a71a613 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 8d4072524609c2f54521c9793f3dbddccde5ce75) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 21:16:48 +0000