summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-291-1/+1
| | | | | Change-Id: I351b564eadc93c6666d30e204ea582b03e9c4bb6 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 Pick-to: 6.5 6.4 6.2 5.15 Change-Id: Ia9726f0079c5f2625d97a341836b3d4505db6be1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-231-1/+1
| | | | | Change-Id: Ia45cb21928267cd37865957b122fbb1ffe361cb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-171-1/+1
| | | | | Change-Id: Ie67645623ed1e07151dbf4454bf15585cead9ee1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Extend TestCon with AppContainer sandboxingFredrik Orderud2022-12-155-4/+148
| | | | | | | | | | | | | TestCon already support starting OLE controls in a "regular" separate process and in a low integrity level (low IL) process. This commit will extend QAxWidget::setClassContext and the impersonation support to also allow starting OLE controls in a AppContainer-isolated process for enhanced security sandboxing. Pick-to: 6.5 Task-number: QTBUG-109184 Change-Id: I525e99ba6934025710bbc97fba0045d0358413b7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Introduce security sandboxing factoryFredrik Orderud2022-12-153-42/+67
| | | | | | | | | | | Encapsulate the LowIntegrity sandboxing impl. behind a Sandboxing interface with a factory function. Done to make room for upcoming AppContainer sandboxing support. Pick-to: 6.5 Task-number: QTBUG-109184 Change-Id: Iaca3b8ba37d317b9cdcde0d194ba13c8beef110b Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-151-1/+1
| | | | | Change-Id: I0d34dfbd984c4784400b57002e80820520a9f834 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.0Jani Heikkinen2022-12-151-1/+1
| | | | | Change-Id: I454198d03b41ee854a2c5dd77b0e042d88bfe2c4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Move low integrity level sandboxing to a new impl. fileFredrik Orderud2022-12-144-49/+67
| | | | | | | | | Done to clean up and make room for upcoming AppContainer isolation sandboxing. Pick-to: 6.5 Task-number: QTBUG-109184 Change-Id: I6ad77ed9a51f11ba134052d96e8ea4614fe2de11 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-111-1/+1
| | | | | Change-Id: If0294ddbf0886e0a0e890a5e8e12afcfd33f0444 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-101-1/+1
| | | | | Change-Id: If1090d372283e797dd64997b3645004e1d598dee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-101-1/+1
| | | | | Change-Id: I6dc664712f162406017d70ef2bb5049dd03fec02 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-091-1/+1
| | | | | Change-Id: I0bba43bbba002c08251a24c704524149879caeac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-071-1/+1
| | | | | Change-Id: Icf2d3e408075e41f6c775dd317e4e5764fd3c799 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark the module free of qAsConst()Marc Mutz2022-12-051-0/+1
| | | | | Change-Id: I914ccc09297ac6283d7cf24d5afc96ebdaf294d0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-12-051-1/+1
| | | | | Change-Id: Ifb9adfbcc00a32d1b8a05904d6f487e2e4e99b8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-261-1/+1
| | | | | Change-Id: Id0f3963e7a50a4d7ebc997a6da382718d102a5e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-181-1/+1
| | | | | Change-Id: I23fd805e84724658767055d5e7fe44d15b03479f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-161-1/+1
| | | | | Change-Id: I7c9f1c19e18f9395216caad274ac2a497ad08cbc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-151-1/+1
| | | | | Change-Id: I527dae65a98532be22268ed3e0102f77fef660c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-141-1/+1
| | | | | Change-Id: Ie87008b2bd26da3e9301ae6d67b2bbfbe199e523 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-091-1/+1
| | | | | Change-Id: I1960aa3017053e461acefc05cb899c23caa74260 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-081-1/+1
| | | | | Change-Id: I731f7daf54637d1f6ebf45612f282c4ba4bcbad3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-11-031-1/+1
| | | | | Change-Id: I9baa0802cf0282b9c8e301308e6713031a8e2534 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enable syncqt cppAlexey Edelev2022-11-021-0/+2
| | | | | | Change-Id: I7b61e436be6753fff934eeb2e13f42d1d34ccb45 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Disable the headersclean check for the ActiveQt module explicitlyAlexey Edelev2022-11-021-10/+6
| | | | | | | | | | | Use the new NO_HEADERSCLEAN_CHECK option instead of disabling the corresponding feature. Amends 5ba16f1d2590041254e428cbf3c20226df73fc61 Change-Id: Ieed063eb5178f6875a1e0afb71c18f36e7870261 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-311-1/+1
| | | | | Change-Id: I997f32089d18083f8fdb1ab849ecb3bbb8e77f9b 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 Pick-to: 6.4 Change-Id: If81f7f6947e35709ce4cf1a0333247fb238cf73a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* 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. Pick-to: 6.4 Task-number: QTQAINFRA-5044 Change-Id: Ib5daa3b7c7d40761a42e5772add69c700752a6e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* CMake: Use new _qt_internal_get_tool_wrapper_script_pathAlexandru Croitor2022-10-281-10/+18
| | | | | | | Pick-to: 6.4 Change-Id: Ic62239033a5a291b7b33b2add460089e4302b8f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-251-1/+1
| | | | | Change-Id: I2b92f8944c5eadf4af5e9321c431d57aa9508100 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-241-1/+1
| | | | | Change-Id: I6c6e62971a632d9eb20fa96d671159868c6e64c6 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 Pick-to: 6.4 Change-Id: Ia49bd0fb575f50a7a8c1f9d5f1bc09b3547256fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* 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 Pick-to: 6.4 Change-Id: Ic1bd258b006746e0233c09fe68842bdeefdfc84f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* AxServer: Fix retrieving IID_IAxServerBase from IUnknownFriedemann Kleint2022-10-191-11/+25
| | | | | | | | | | As suggested in report, do the same for VT_UNKNOWN. Pick-to: 6.4 Fixes: QTBUG-106014 Change-Id: I09ecd5895a0caa409eed237e551af2a1fafdad00 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-171-1/+1
| | | | | Change-Id: Ib67294965849e89a277aeab9840fd24b1a097f6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add all header files that belongs to the repository to ActiveQt moduleAlexey Edelev2022-10-131-1/+18
| | | | | | | | | | | | | | | | ActivetQt module supposed to hold all header files from all modules in repository. New syncqt procedure requires all header files that belongs to a module are listed in respective SOURCE section of either qt_internal_add_module or qt_internal_extend_target calls. Meanwhile the usability of ActiveQt module is quite questionable, since by linking the module users will get access to the header files from other submodules, but the use of corresponding non-inline functionality will lead to a linker errors. Fixes: QTBUG-107089 Change-Id: I163a748eb756c805c34dbd477e140ba21ba02c1f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-101-1/+1
| | | | | Change-Id: Iac8a2561ff611dfcbf487e9abf3bd20e2fddfa3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from qAsConst() to std::as_const()Marc Mutz2022-10-064-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. Task-number: QTBUG-99313 Change-Id: I7d7d21564161807692941b12085686711583d556 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-041-1/+1
| | | | | Change-Id: Id6198b996b8397c8c3e2dadc81c757c9df592ca9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-10-031-1/+1
| | | | | Change-Id: I7d5345befdeca7f00f4802eba92ba24dc4553382 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-291-1/+1
| | | | | Change-Id: Ie580e32878aa55ac98a3ebd5e5ef296cc66aee92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-291-1/+1
| | | | | Change-Id: I304415d809861551114fe7a989323d9891f6d369 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't use PUBLIC_LIBRARIESKai Köhne2022-09-283-3/+3
| | | | | | | | | | | | | | Fixes configure time warnings like CMake Warning at qtbase/cmake/QtToolHelpers.cmake:81 (message): qt_internal_add_tool's PUBLIC_LIBRARIES option is deprecated, and will be removed in a future Qt version. Use the LIBRARIES option instead. Call Stack (most recent call first): qtactiveqt/tools/dumpdoc/CMakeLists.txt:11 (qt_internal_add_tool) Change-Id: Ibbd00183cafe6ac8b5c1dd4b30c5cc1948b65b7d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-261-1/+1
| | | | | Change-Id: I282ddfe32c43df80258e7ff5169523656b05aa0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-201-1/+1
| | | | | Change-Id: I5a038d28b56cec1445a1e6e16c70266b86710de5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-191-1/+1
| | | | | Change-Id: I1b1b706391910bc8aa304847e614e759bcae4954 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-161-1/+1
| | | | | Change-Id: I9a955e3079ec8cc4d1df0807370521c481ac8c3f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-141-1/+1
| | | | | Change-Id: Iee7b84da7fd6aa094896a37f5b83e776c60d884f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2022-09-131-1/+1
| | | | | Change-Id: I30bc5c041e3bb37b494f6b23d7819e86ee12df60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status