summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.1' in qt/qtactiveqt6.5.1Qt Submodule Update Bot2023-05-161-1/+1
| | | | | Change-Id: Iadfef732c650efa6b7ffadaa343ee178e7fe63c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtactiveqtQt Submodule Update Bot2023-05-141-1/+1
| | | | | Change-Id: I6db72e0bec2e4ac65c6658e5630cd7e4e255fff0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtactiveqtQt Submodule Update Bot2023-05-111-1/+1
| | | | | Change-Id: I1cb14bee147fb72c3c2b5335ac9bfd713c87d3e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.1' in qt/qtactiveqtQt Submodule Update Bot2023-05-051-1/+1
| | | | | Change-Id: I26ce94343111f0e505d5854ed07f4b49cb4ce5e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-05-021-1/+1
| | | | | Change-Id: I9ae818bfff0034f93a01c0768f85478a04eb4777 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-05-011-1/+1
| | | | | Change-Id: I336065e75619d884ad65bbe614360a069e54812e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Docs: Fix "Can't link to" example warningsSafiyyah Moosa2023-04-283-11/+2
| | | | | | | | Task-number: QTBUG-113160 Change-Id: I9ef083bb4274b75c6c5d3727978eeab19517e9cb Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 3edd7a235dc284dfb66dd0268438a6c1cd9dda3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-281-1/+1
| | | | | Change-Id: I417f082e9fdead727d5e27ad542c8b6101dad2ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-261-1/+1
| | | | | Change-Id: I7ce1bb1dac18f21df810024ed345ef0fd7c37030 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-201-1/+1
| | | | | Change-Id: Ieeb94dca93e376e196fc295b0f41f9884aa79b67 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-191-1/+1
| | | | | Change-Id: Ie987d0a98918b1806bbe0e6fb5d91d127d047610 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-171-1/+1
| | | | | Change-Id: Ic2532b10fcac21949e3cfc5fea1880391e6b8c9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-131-1/+1
| | | | | Change-Id: I5f7398555f3352f21082879b7df89b080ddae956 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-121-1/+1
| | | | | Change-Id: I26e43acb011aa84745d0dac74ac1d5d02209e6ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* examples: Remove opengl exampleOliver Wolff2023-04-1115-41/+27
| | | | | | | | | | | We should not have examples that are specific to opengl on Windows. In order to keep the use case's code in source, the example was moved to tests/manual. Change-Id: Ie55aea777c449913e66279728c53f08c4105b66c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f013e692ca7d6ed84cdece82d06ae73ec04bcc1d)
* examples: Remove multiple examplesOliver Wolff2023-04-0614-37/+26
| | | | | | | | | | | | | The functionality of providing multiple ActiveX controls in a single process server should be covered in a documentation snippet. In order to keep the use case's code in source, the example was moved to tests/manual. Change-Id: I2633637e8202aadc7798ba5816a61ec1743f0b03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1bad3a86dcdc6c168090f17e93c86490d601d4f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: Remove menus exampleOliver Wolff2023-04-0617-36/+27
| | | | | | | | | | | | | Showing the usage of QMenuBar and QStatusBar in a QMainWindow can be merged into another if needed. In order to keep the use case's code in source, the example was moved to tests/manual. Change-Id: I76ec12e9c83a42028f2de95ab17ca07544b53425 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 73f52eb39f80ce2ba9602c3faf8939b752aa9098) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: Remove media player exampleOliver Wolff2023-04-0611-49/+31
| | | | | | | | | | | | | Embedding the media player looks really outdated so it shouldn't be promoted inside an example. In order to keep the use case's code in source, the example was moved to tests/manual. Change-Id: I54b23e1a5e4d7b0910ce238ff2fefb14da540739 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4fa7ebcf6390ed415ffd8d6bdc4987b789dad309) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples: Remove hierarchy exampleOliver Wolff2023-04-0615-36/+25
| | | | | | | | | | | | | Functionality is also covered in other examples so that hierarchy is no longer needed. In order to keep the use case's code in source, the example was moved to tests/manual. Change-Id: I6b3e46d402877b93cfa4dc555328e1e115ec4fc6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e7b67edeefcf01a7155c8b6adeffb1304d4d22e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-031-1/+1
| | | | | Change-Id: I83fce1b5c80641518643b160c2e41846e371b484 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-04-031-1/+1
| | | | | Change-Id: I33dc5dd865e2a93dd7b8e7e0b651b27fe1f55b5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-241-1/+1
| | | | | Change-Id: Id2202d32aed2d0676968b82d29fc787d3e0163d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix QAxScriptManager::callVolker Hilsheimer2023-03-223-31/+38
| | | | | | | | | | | | | | | | | | | It takes the name of the function, not of the script name so use the scriptForFunction helper to find the QAxScript object that provides access to the function. The previous code implies that this should work for both function names and for full function prototypes, so implement that correctly and without allocating too many unnecessary temporary objects. Update the test that is now passing to cover all scenarios. Change-Id: I939942cc805a56212d70b1a12b95aaa4b2f64d59 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 855472a28675f11778a54ef1e42f6114d924b9e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add test coverage for QAxScript and QAxScriptManagerVolker Hilsheimer2023-03-224-0/+228
| | | | | | | | | | | | That framework has not aged well, add more tests to avoid regressions, and to document the complete failure of QAxScriptManager::call to say what it is expected to do. Change-Id: I20acb3eba3f439d2608ec930d9e90b44a83ef980 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit f6595345f053c43660d27fb9529baaa19ca96dcf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix handling of out-parameters that are of VARIANT-typeVolker Hilsheimer2023-03-223-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt knows about QVariant as a built-in meta type, QMetaType::QVariant. It is no longer mapped to user type. COM objects expect that untyped out- parameters, which are mapped to QVariant& by ActiveQt, are passed in as VT_VARIANT|VT_BYREF. Update our variant-conversion logic accordingly. If the typeName, which comes from the generated function signature, is "QVariant", then QMetaType::fromName(typeName) will always be QMetaType::QVariant, and had to be passed as VT_VARIANT. Fix the logic for deciding whether we have to write back the out- parameters so that it works when QAxScript::call is used. We need to write back no matter whether it's a property or a getter, so check whether any bit is set, not if both are set. Add some test for this. Not cherry-picking this further back, the auto-test coverage of ActiveQt is not good enough to make sure that we don't break any subtle usecases in e.g. QAxServer, and the usage of QAxScript does not seem to be very wide. Fixes: QTBUG-111718 Change-Id: I239f71c3637ea9f32dff5123a8ada96e0a894371 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit e640503b65c4d786edc9f005a1c3f6f66e87793d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-221-1/+1
| | | | | Change-Id: I9c0c098f9d39b090ddbf1805a8096f5f9d579890 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Refactor test to use modern string literalsVolker Hilsheimer2023-03-211-8/+9
| | | | | | | Change-Id: I2279d8db950dce3b466fd0258c8bab8d4483313e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 4e1e7938763b5b8323c5e437286ccccd31d95156) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix naming of auto testsVolker Hilsheimer2023-03-212-4/+4
| | | | | | | | | Add tst_ prefix as is convention. Change-Id: I37e2674fdf809dfd548b52a39931459452a8a049 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1b584f5974d4def5a9abc53d6935d40047c75bc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-161-1/+1
| | | | | Change-Id: I829a4447eaa32985ca23ceb41928296cdc00bc46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-101-1/+1
| | | | | Change-Id: I75f03c5de1791a038dc8fc8d901e3f1b9149e295 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-081-1/+1
| | | | | Change-Id: Ie6f3c28775e41c9218f34721930acb9dbe58d5de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-031-1/+1
| | | | | Change-Id: I1002d6309bdfdb29ea6a9c1493da0dcfe1417dee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-021-1/+1
| | | | | Change-Id: I8004f62d5407a2774619c2675ede99e4949b45d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* idc: Sync usage info with actual parameter parsingOliver Wolff2023-03-011-2/+4
| | | | | | | Change-Id: I58f444023e955dae4cb93b8265481a231bd40bf0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> (cherry picked from commit 8f0609ee78c1ecc180326b522a0bc5ba3e2360b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-03-011-1/+1
| | | | | Change-Id: I4c1e5624dec82e63487eee1abe3c85cb92bf2398 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-231-1/+1
| | | | | Change-Id: I4938b8ba9938e3596017ab9fe4b01ea11b444934 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-211-1/+1
| | | | | Change-Id: I3a69d7225b4f2e32e50e065c1f3b5955b767f763 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Define WINAPI for documentation builds on non-Windows platformsTopi Reinio2023-02-201-0/+4
| | | | | | | | | | | QDoc's Clang-based parser gets confused if WINAPI is not defined, causing it to fail to match documentation blocks with declarations in the header. Change-Id: I222c085c03bdb9e7361b055b8c2371ef4c9c6a38 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 4b169ce5b5f224ae9b443dc46dd16c832d3fdda3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtv6.5.0-beta3Qt Submodule Update Bot2023-02-151-1/+1
| | | | | Change-Id: I7dfb4d31c77a77e0e246b32bf8d06ea7c59e4c28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-152-0/+8
| | | | | | | | | Task-number: QTBUG-109394 Change-Id: I11c1f93360bc07980636b32c65e7b99095e4f2d9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1feefed0e4a19cd1430ea840be63ef40cb855496) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-133-8/+3
| | | | | | | | | | Use the new headers to get the Windows image conversion functions. Task-number: QTBUG-109394 Change-Id: I34cc05865c1fa1305a1cbca96a0c47525288639c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 07c86351a78cff4af8d78ed232916147fd181d3f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-101-1/+1
| | | | | Change-Id: I06e45b05c813d77efd245942b0e295544ecc4cab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-0923-141/+22
| | | | | | | Change-Id: I1e1a376363224b88354da3e30fcea877f0e82f41 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit a983cf7572ab3e8f351e89cd2c9b6ef8b7e68f60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation of code within macro QT_CHECK_STATEFriedemann Kleint2023-02-091-2/+4
| | | | | | | | Task-number: QTBUG-109394 Change-Id: I362a7bb24e23a30e49ffb80422573dca8562e87c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 8c616b587c13f161ab3f6de7cb1b18e8d97d2300) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-081-1/+1
| | | | | Change-Id: Idc3a341014ce07ebe166d54801c00ecf9b128367 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-061-1/+1
| | | | | Change-Id: I5333aeb76d558004dc6adf1faeffd2c79c8fb9c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-02-011-1/+1
| | | | | Change-Id: I7ce973d1afd5a48ceed0b5ee430d4b2a31e95240 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-01-311-1/+1
| | | | | Change-Id: I497fe8a7441503a989ef965ba308439fb0aec5bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtactiveqtQt Submodule Update Bot2023-01-271-1/+1
| | | | | Change-Id: I6fe360ca11012a9ade089bb73b1020831b4d27b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix invalid QApplication constructionFredrik Orderud2023-01-232-6/+3
| | | | | | | | | | | | | | | | | QApplication construction with argc=0 is incorrect according to the doc. The construction pattern is furthermore causing problems in QtWebEngine, which is expecting the executable name as first command-line arguments as reported in QTBUG-110157. Fix problem by using the Microsoft-specific __argc and __argv globals. This ensures that the actual command-line arguments are used for QApplication construction. Task-number: QTBUG-110158 Change-Id: Ib8e6ac7a1c24cfabfdafe8489fe8b8c4765753fd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit a1b49152e7a46da955515b8d38d86b947d78bd26) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status