summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtactiveqtHEADdevQt Submodule Update Bot2023-05-171-1/+1
| | | | | Change-Id: Ifd66dd98fce8621f594dd3d49afeff90f66aebe2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-05-111-1/+1
| | | | | Change-Id: Ib7f4de957f50f5c60e8d6762c5630428ef20e1e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Replace mentions of deprecated macrosTopi Reinio2023-05-091-2/+2
| | | | | | | | | | Q_ENUMS() and Q_FLAGS() are deprecated in favor of Q_ENUM() and Q_FLAG(). Pick-to: 6.5 Task-number: QTBUG-113229 Change-Id: I715f0eded2fbd62611b381e560f7f6548f797d45 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-05-081-1/+1
| | | | | Change-Id: I25c8ea3f215d041e69cb6d3452df736944b32a6b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-05-021-1/+1
| | | | | Change-Id: I0e773b5f7e844431f9ef457416e50c07e70d2e11 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 Pick-to: 6.5 Change-Id: I9ef083bb4274b75c6c5d3727978eeab19517e9cb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-271-1/+1
| | | | | Change-Id: I918f26108f901ec80cafa2f0e196409df8edd64b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-241-1/+1
| | | | | Change-Id: Icec062e01a527ceda97049b00d18a0a793b40b8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-201-1/+1
| | | | | Change-Id: Ifee8119dfed16607e236f2f04705139fae2dd486 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-181-1/+1
| | | | | Change-Id: Ifc09fec3303af5b34618f6948fe46d0dfd9754d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-131-1/+1
| | | | | Change-Id: Ibe1f27f0ef57d389bdfc2cc43d25d24bf934498b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-121-1/+1
| | | | | Change-Id: I11d854344f145f4d96d76a6b57174fa313956165 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-111-1/+1
| | | | | Change-Id: I8cd7379b229a889bb2d2a977914648a4d6286890 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* examples: Remove opengl exampleOliver Wolff2023-04-0615-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. Pick-to: 6.5 Change-Id: Ie55aea777c449913e66279728c53f08c4105b66c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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. Pick-to: 6.5 Change-Id: I2633637e8202aadc7798ba5816a61ec1743f0b03 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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. Pick-to: 6.5 Change-Id: I76ec12e9c83a42028f2de95ab17ca07544b53425 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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. Pick-to: 6.5 Change-Id: I54b23e1a5e4d7b0910ce238ff2fefb14da540739 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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. Pick-to: 6.5 Change-Id: I6b3e46d402877b93cfa4dc555328e1e115ec4fc6 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-04-051-1/+1
| | | | | Change-Id: If765b2534ee3a0a0b99aff16e8ba065cbaa0e2ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Follow up on meta object version bump in qtbaseVolker Hilsheimer2023-04-051-2/+17
| | | | | | | | | | | | | | | | | | | After b83de5f9a43b094bbb77b3aeea77983ea508a2b0 in qtbase, moc generates complete type information for enum types. ActiveQt declares enums from type libraries (i.e. on namespace level) also in the metaobject of each generated class (as we can't inherit the namespace meta object from each QAxObject class). But those enum types don't really exist on C++ level. So moc generates incorrectly qualified enum types. Augment the post-processing code to detect whether a type that is actually in the namespace is used as if it was in the class, and replace the qualifier. Bump the metaobject revision. Change-Id: I4d28abaa47a5fa3db70737d006b8e1becf8a51e3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-03-281-1/+1
| | | | | Change-Id: Ifcf909b71bd9097b9afc435e8c8a6e714869f89c 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. Pick-to: 6.5 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>
* 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. Pick-to: 6.5 Change-Id: I20acb3eba3f439d2608ec930d9e90b44a83ef980 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* 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 Pick-to: 6.5 Change-Id: I239f71c3637ea9f32dff5123a8ada96e0a894371 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Refactor test to use modern string literalsVolker Hilsheimer2023-03-211-8/+9
| | | | | | Pick-to: 6.5 Change-Id: I2279d8db950dce3b466fd0258c8bab8d4483313e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix naming of auto testsVolker Hilsheimer2023-03-212-4/+4
| | | | | | | | Add tst_ prefix as is convention. Pick-to: 6.5 Change-Id: I37e2674fdf809dfd548b52a39931459452a8a049 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-03-191-1/+1
| | | | | Change-Id: I8744b8da57d93a475f51b6b478b01604d091651a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-03-101-1/+1
| | | | | Change-Id: I3b995070fe66610be7a6877fdacbee03f61f93ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-03-021-1/+1
| | | | | Change-Id: I9c72001412d31d9e31850ca2a71204f8045c765c 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
| | | | | | Pick-to: 6.5 Change-Id: I58f444023e955dae4cb93b8265481a231bd40bf0 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-02-241-1/+1
| | | | | Change-Id: I36ddc0c7d2c7d1c14b0b10e4baece956950040ba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-02-201-1/+1
| | | | | Change-Id: I20555ae7aaccad40b7e88eb58aec9b20875383b8 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. Pick-to: 6.5 Change-Id: I222c085c03bdb9e7361b055b8c2371ef4c9c6a38 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-152-0/+8
| | | | | | | | Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I11c1f93360bc07980636b32c65e7b99095e4f2d9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-133-8/+3
| | | | | | | | | Use the new headers to get the Windows image conversion functions. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I34cc05865c1fa1305a1cbca96a0c47525288639c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-02-131-1/+1
| | | | | Change-Id: Ic8d19373c49f7897df3a5fc834f9a5123b2cc37e 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
| | | | | | Pick-to: 6.5 Change-Id: I1e1a376363224b88354da3e30fcea877f0e82f41 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix compilation of code within macro QT_CHECK_STATEFriedemann Kleint2023-02-091-2/+4
| | | | | | | Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I362a7bb24e23a30e49ffb80422573dca8562e87c Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-02-011-1/+1
| | | | | Change-Id: I7f8637f94c3d63b7fc446ffc2b0508a7770e2efa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-311-1/+1
| | | | | Change-Id: I8474d3f5415fa80fbddddae85b6d992ce0911742 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-271-1/+1
| | | | | Change-Id: Ibdb924277a12f048fab29e6405a78de9bd34138f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-241-1/+1
| | | | | Change-Id: I5a606c77c60327073f5fcdff17515a1eb9a99f80 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. Pick-to: 6.5 Task-number: QTBUG-110158 Change-Id: Ib8e6ac7a1c24cfabfdafe8489fe8b8c4765753fd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-191-1/+1
| | | | | Change-Id: I1af76cd75b235efaea063323bfe32fa646225489 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-171-1/+1
| | | | | Change-Id: Ibb751c1d1383d6ba65d66c8fe7c5b94aacb71df4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-121-1/+1
| | | | | Change-Id: Ifd5aad6301292239de7133737e97098bc419980e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-091-1/+1
| | | | | Change-Id: I094445ad1aa54f6f65119cfee41d91fe532d8f8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-041-1/+1
| | | | | Change-Id: Ia9b8f7e44d9b5b296d5f55e4769dae19789b7027 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_USE_SYNCQT_CPPAlexey Edelev2023-01-021-2/+0
| | | | | | | | Option has not effect anymore. Pick-to: 6.5 Change-Id: I234cf7df1563d8f3f0dbda2cd60b58529b804762 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtactiveqtQt Submodule Update Bot2023-01-021-1/+1
| | | | | Change-Id: Icf19d3ba1fcdaf3a7d44364521fc94c2b0e722a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status