summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.0' in qt/qtactiveqtv6.4.06.4.0Qt Submodule Update Bot2022-09-231-1/+1
| | | | | Change-Id: I3202b536d3b9b682cbec351efd18c989a4b43efa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtQt Submodule Update Bot2022-09-201-1/+1
| | | | | Change-Id: I4fcf10687dbab6e489ec09fd92b6c457c19cd941 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtv6.4.0-rc1Qt Submodule Update Bot2022-09-131-1/+1
| | | | | Change-Id: I823cad0ceceaa86a08cbb67ebb4d84d41e70fe90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtQt Submodule Update Bot2022-09-121-1/+1
| | | | | Change-Id: I2a8843212cd27fc4ce8fc506d07eac95850cdd3d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtQt Submodule Update Bot2022-09-091-1/+1
| | | | | Change-Id: I4cc277910ed869c67abf588a9a8746e33e2d89f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtQt Submodule Update Bot2022-09-071-1/+1
| | | | | Change-Id: I37cd622c014c40c9e096741e008f6c9664deeb8d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtactiveqtQt Submodule Update Bot2022-09-061-1/+1
| | | | | Change-Id: I7f176715ec8ff276d843bfff241ff6167154bc95 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>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-281-1/+1
| | | | | Change-Id: I225165133b5df33f12c35d637b8287a8eb0ab5df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-271-1/+1
| | | | | Change-Id: I14475b6d5fe46e1985a3182ca9ac3c18c08d555f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-201-1/+1
| | | | | Change-Id: I67b2c1572e9599745fe68615594f029360cd2e42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-191-1/+1
| | | | | Change-Id: I8217e79c61b1fd5bf84f76c14b4801f89e4d4ee5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-151-1/+1
| | | | | Change-Id: I2b88fb32ffb8fc38fd9c1e42580a9252ba4aa9b2 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.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-131-1/+1
| | | | | Change-Id: I92db21dc9dbfb3ac11a13a9e1c90d1e3a09c8fa8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-07-081-1/+1
| | | | | Change-Id: I40011c2cb5c507746a3c247560948df86cf230c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtv6.4.0-beta2Qt Submodule Update Bot2022-06-301-1/+1
| | | | | Change-Id: I84bdf33432f2bded656e7d180fead738459f0eeb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-06-281-1/+1
| | | | | Change-Id: Ibb0946b1e45c7b24cd0c01b2f4c4770ca144ef63 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.4' in qt/qtactiveqtQt Submodule Update Bot2022-06-211-1/+1
| | | | | Change-Id: Id0d2ef366085e70fa22f61f3a64e886e7518b9e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-06-171-1/+1
| | | | | Change-Id: I071abcd8e0c157241f398c06c3ce74a86d902449 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>
* 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.4' in qt/qtactiveqtQt Submodule Update Bot2022-06-141-1/+1
| | | | | Change-Id: Ib1d5a80444faa71cdbbcdf87c27a3411d53a76af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtv6.4.0-beta1Qt Submodule Update Bot2022-06-111-1/+1
| | | | | Change-Id: I1f764cc42eb15447c42e5945364ff826bf9a97f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-10146-5575/+345
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Ibdefc58cad3b83d0d117fc333de76ccb5177a621 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2e7234cc40b853c3e796556617b6bd05049fa192) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtactiveqtQt Submodule Update Bot2022-06-061-1/+1
| | | | | Change-Id: I904b085671e4dd8dc62774f28d9a6a12d130732f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-06-021-1/+1
| | | | | Change-Id: Ifac58e3c56aa0500d0472e76d27da695d831fcde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-311-1/+1
| | | | | Change-Id: Ie85c58a2237777dc4e18a28b3a847ee6dc4765d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-271-1/+1
| | | | | Change-Id: I54cb9dc617746ebad141af4310a1116360d58c35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-231-1/+1
| | | | | Change-Id: I2179f56bd097ecd273b564e314e28928cdccf198 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-191-1/+1
| | | | | Change-Id: I5cc79318965f361a831c6d27b2765aab2055176f 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 Pick-to: 6.3 Change-Id: Icfe7cb5365b4679846bcd6bdd5cc478685910a34 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-161-1/+1
| | | | | Change-Id: I5357262fafa35e25b621006a6ed0e0a718d5faef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-121-1/+1
| | | | | Change-Id: Ibca88afa2b4090f27cfaf4be02f741a9a1e8da39 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-101-1/+1
| | | | | Change-Id: I89d946626030bfe978aaf8ecee8f13b37c44d527 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-05-041-1/+1
| | | | | Change-Id: I951c0838dba61d7d6c729055cabd43670bcf3018 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-04-291-1/+1
| | | | | Change-Id: I9263efdabfcc1540277fdac378c28411a028adb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-04-271-1/+1
| | | | | Change-Id: I10e0f6c5a384444db61d7eae18bd1660a56375f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-04-191-1/+1
| | | | | Change-Id: Id8d42910f6d6fc53c83fd9642046315934058f76 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status