summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* examples: Remove opengl exampleOliver Wolff2023-04-0612-0/+583
| | | | | | | | | | | 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-0611-0/+254
| | | | | | | | | | | | 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-0614-0/+356
| | | | | | | | | | | | 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-068-0/+426
| | | | | | | | | | | | 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-0612-0/+310
| | | | | | | | | | | | 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>
* Fix QAxScriptManager::callVolker Hilsheimer2023-03-221-1/+6
| | | | | | | | | | | | | | | | | | 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-221-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-0910-50/+8
| | | | | | Pick-to: 6.5 Change-Id: I1e1a376363224b88354da3e30fcea877f0e82f41 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Prepare for moving qVersion() from qglobal.h to qlibraryinfo.hSona Kurazyan2022-08-301-0/+1
| | | | | | | Include qlibraryinfo.h where it's used. Change-Id: Ibf54612eb1678963cab2c5030f57118b058c68cf Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-2318-18/+18
| | | | | | | Task-number: QTBUG-105718 Change-Id: I7cf0f0a98984e5ec6c1edb30f6ba979305c344f4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Don't use PUBLIC_LIBRARIES for tests and test helpersAlexandru Croitor2022-07-277-11/+11
| | | | | Change-Id: I7bd3d18c7f77a6b058bc08081e7adb310ebd1f2c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-0718-0/+54
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: I07739807abcf7d8f305bb17cfdc6edefba49a2b1 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-1018-486/+36
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: Ibdefc58cad3b83d0d117fc333de76ccb5177a621 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-228-8/+8
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I5d8b0e42bd149e5f88326baa4b1f28a5f37e4ec2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove High DPI scaling attributesFriedemann Kleint2021-07-152-8/+0
| | | | | | | | | They no longer have any effect and cause warnings and errors. Pick-to: 6.2 Change-Id: Ibeb25186d92a0755a06193f34892ac0d64314e2e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update tests and examples to use the new '_axserver_' functionsAlexey Edelev2021-04-271-0/+2
| | | | | | | | | | Use the new '_axserver_' function in tests and examples associated to creating of the ActiveX sever. Squash find_package calls. Change-Id: Iacdba7b673ae9cfcc7d9e1ff82d0884e330166ab Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix cmake autotestJuha Vuolle2021-04-201-5/+2
| | | | | | | | The testcase relied on optional packages and that the last of them is successfully found. Change-Id: Iaeb83cc508759de75fbeb0683ca998c022d03d2f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove QMake project filesAlexey Edelev2021-04-1214-148/+0
| | | | | | | | | | Remove the .pro/.pri project files and the associated .prev_CMakeLists.txt files. Task-number: QTBUG-78167 Pick-to: 6.1 Change-Id: I8dea2d3efccf8bae6a4b41779dccfaf5f9f83222 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix manual testsAlexey Edelev2021-04-123-21/+26
| | | | | | | | | | | | Restore the path definition to the diaglib test library and fix its usage. Add optional dependency on OpenGL OpenGLWidgets for the axviewer manual test. Pick-to: 6.1 6.1.0 Change-Id: If7692172a498556c616f78f7d477d8e3b126faed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Rework deprecated cmake testsAlexey Edelev2021-03-234-47/+8
| | | | | | | | | Pick-to: 6.1 Fixes: QTBUG-78167 Change-Id: I8c34d36502b4dc9092c7cf88b34bef569cd7a4bf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add qt6_target_typelibs functionAlexey Edelev2021-03-2314-8/+272
| | | | | | | | | | | | | qt6_target_typelibs should replace the qmake functionality associated with the TYPELIBS variable. This function adds custom call of the dumpcpp program to generate typelib-related sources and adds the sources to the target. Pick-to: 6.1 Task-number: QTBUG-78167 Change-Id: I7b61a2b1804162e723e862945a9650a00776e678 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Re-generate the CMake project filesAlexey Edelev2021-03-129-9/+17
| | | | | Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix warnings about deprecated QVariant::TypeFriedemann Kleint2020-10-301-1/+1
| | | | | Change-Id: I377e524edaf686d1a77e24f3dcb8f94476004b43 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-231-1/+1
| | | | | | Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove winrtOliver Wolff2020-06-172-3/+73
| | | | | | | Task-number: QTBUG-84434 Change-Id: I0a7628ac33971154244d3ddfe824889795aea06c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Initial port to cmakeFriedemann Kleint2020-05-1210-0/+194
| | | | | | | | Port the 2 main libraries, examples and tests. Task-number: QTBUG-78167 Change-Id: I0d00c9fa352a96dcd0e1f42d52e6f15680abd9ed Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restructure the librariesFriedemann Kleint2020-05-064-10/+5
| | | | | | | | | | | | | | | | | | | | | | | Establish QtAxContainer and QtAxServer as proper modules. Add QtAxBase as a static helper lib containing qaxtypefunctions.cpp and qaxutils.cpp from the shared directory. qaxtypes.cpp remains in the shared directory as it is used by both modules with differing defines. The VARIANT <-> QVariant conversion is exposed via QAxBasePrivate for testcon. Add activeqt as a header-only module modeled after platformheaders. This makes it easier for the cmake conversion tools. Task-number: QTBUG-78167 Task-number: QTBUG-27776 Change-Id: I3e7956ea91f2177b8c2596402908351b4d99c510 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-1110-193/+468
|\ | | | | | | Change-Id: I4e9dbc17f87a6b604b77ca9e0f9ac1810df870a1
| * Add a manual test for dumpcppv5.15.0-beta4Friedemann Kleint2020-04-0810-193/+468
| | | | | | | | | | | | | | | | Let it generate code for the WebBrowser and display the meta object. Factor out useful code from axviewer. Change-Id: Ib250c749459836e2145f83f4f68fa0caee2a2ad9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | dumpcpp: Use moc to generate metaobject codeFriedemann Kleint2020-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dumpcpp contained an old version of moc code, which is now out of date. Write out the interface as C++ code and run the real moc on it to generate this. Some modifications are required. Remove some asserts that checked on an empty meta object created in the fallback path of QAxBasePrivate::metaObject() which was removed by 0bcdc74f55574e1a45bef8728bd5093cf1acfc33. Task-number: QTBUG-82945 Change-Id: Ide58bae1440331ea4d5da0fcc74b41f49f09599a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Update include for QAction after move from widgets to gui in qtbaseVolker Hilsheimer2020-04-013-2/+3
|/ | | | | | | | | - Fix include for QAction after move from widgets to gui in qtbase - Adapt to OpenGL split - Skip dumpcpp test for the moment Change-Id: I8fcec00c56158ee427a9f374b07bb814a99d3bce Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* axviewer test: Add a metaobject dumpFriedemann Kleint2020-03-271-1/+220
| | | | | | Task-number: QTBUG-82945 Change-Id: If9c84743779acdd199fd67ec2c2f4fc72f58129a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Stop using DISCARDABLE attribute for icon resourcesFredrik Orderud2019-02-261-1/+1
| | | | | | | | | | The DISCARDABLE attribute is only supported on 16bit Windows, and is ignored for 32 & 64bit applications. Usage can therefore be removed to simplify the sample code. Microsoft doc: https://docs.microsoft.com/en-us/windows/desktop/menurc/common-resource-attributes Change-Id: Ib84217a79cb726b6c1355107e6b254033de515fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Replace CoInitialize calls with CoInitializeExFredrik Orderud2018-08-131-1/+1
| | | | | | | | | | | | Done to make single-threaded apartment (STA) usage more explicit. CoInitializeEx(0, COINIT_APARTMENTTHREADED) does exactly the same as CoInitialize(0), so there is no change in behavior. REF: https://docs.microsoft.com/nb-no/windows/desktop/api/combaseapi/nf-combaseapi-coinitializeex Change-Id: I2e2f77745b4360b1da1e6c284551d0f709aba546 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-291-1/+1
| | | | | Change-Id: I0df68cec43511537b61ddfe74bd677be7a598eae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix licensingJani Heikkinen2017-04-272-34/+24
| | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with GPL-EXCEPT one Task-number: QTBUG-57147 Change-Id: I4c97cdcff6dfe3ed17d85d391bc700daa4f267a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-075-0/+141
|\ | | | | | | Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06
| * Add a control for manual testing.Friedemann Kleint2016-02-185-0/+141
| | | | | | | | | | | | | | Task-number: QTBUG-41186 Task-number: QTBUG-50206 Change-Id: I5de37c187e40ddbe3eccb07b01f895897196ece1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-256-102/+72
|/ | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I28b956229a96fd982b22640226a716c1a4f3aa0d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Add a simple manual test for loading Active X controls.Friedemann Kleint2016-01-122-0/+177
| | | | | | | | | | | | Add a simple Ax Viewer console application that can be passed a CLSID on the command line with options to dump the widget/ window hierarchies using diaglib. Debugging it is easier than debugging testcon, which is also a server that cannot be built as console application. Task-number: QTBUG-50206 Change-Id: I0c267fad3421ed05764ce36fb2cc0b1bcca22b75 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add more types to QVariant->VARIANT conversion.Friedemann Kleint2015-03-243-0/+208
| | | | | | | | | | | | | | | Introduce a macro for POD type conversion and add char, short and float. Remove the type coercion branch which is dead in Qt 5 since QVariant::nameToType() always returns a valid type for char, short and float. Add autotest. Task-number: QTBUG-45057 Change-Id: If3684d229a653c51b67015a7ef0c4631ead64a94 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-115-33/+33
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Suppress DISPATCH_PROPERTYGET for calls from QAxScript.Friedemann Kleint2014-11-073-0/+70
| | | | | | | | | | Factor out a version QAxBase::dynamicCall() taking a flag that allows for suppressing DISPATCH_PROPERTYGET and use that from QAxScript to fix return types. Add autotest. Task-number: QTBUG-42289 Change-Id: I1900061bc2de6d5987cb7323bb388df806e53e96 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* In some controls the property can be listed twice so merge the flagsAndy Shaw2014-10-241-0/+13
| | | | | | | | | | In the remote desktop client control there were separate entries for the getter and setter of the properties and the flags for the getter would override the other. Therefore the flags should be combined as the relevant function would be used anyway for the purpose. Change-Id: I212b23cf69c96be71dcd8a7493e8a57cb69ff5fe Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update license headers and add new license filesv5.4.0-alpha1Jani Heikkinen2014-08-264-74/+42
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ib9c4cfb6651a523e2da710f0a71586ec84538007 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-102-2/+2
| | | | | | Change-Id: Ia19cb01ac9f0c5e3863e684d2f701ac424ba64f4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Re-enable and test the ActiveQt CMake files.v5.0.0-rc2Stephen Kelly2012-12-128-1/+185
| | | | | | | | | | | | | | | | The Qt5AxContainer CMake module is the most commonly useful, and the more simple. Using Qt5AxServer requires the user to do some post-build actions currently. In the future, it may be possible to add CMake macros for that kind of thing, but as most people won't use CMake for this at all, it is not so important at this time. http://thread.gmane.org/gmane.comp.programming.tools.cmake.user/44824 Change-Id: If33938f829fbf53190aee9d4652516e1c450f05c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
View Lorry Controller Status