summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* fix activeqt module structureJoerg Bornemann2012-11-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The formerly monolithic ActiveQt module has been split into three modules: axserver A static library for creating a server project. axcontainer A static libary for creating a container project. axbase A static library with shared code for the latter two libraries. This module also is responsible for the installation of header files in the include/ActiveQt directory. "CONFIG += qaxserver" has been deprecated. Use "QT += axserver" instead. "CONFIG += qaxcontainer" has been deprecated. Use "QT += axcontainer" instead. Code from qaxtypes.cpp that does not depend on the QAX_SERVER define has been moved to qaxtypefunctions.cpp and resides in the axbase module. Task-number: QTBUG-27776 Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-232-48/+48
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4060147644d7ca34ccff71b3deb30e242b611dab Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix dumpcpp tool to work with revision 7 metaobject format.Miikka Heikkinen2012-09-123-1/+80
| | | | | | | | | | | | | | | | | | | | | | Dumpcpp tool still generated revision 1 moc format, so generated code would no longer compile. Ported relevant revision 7 generation code from moc tool to dumpcpp tool. Also squashed multiple generated string tables into a single string table. QVariant::nameToType(typeName) no longer returns UserType for QVariant, so fixed few comparisons to take this into account. Removed warning print from MetaObjectGenerator::addProperty(), as this just spams warnings unnecessarily when generating properties. Normally the required metatypes are not registered at time of generation (e.g. when running dumpcpp tool). Note that the check for this warning was buggy in Qt4, so it already never printed there. Added a simple autotest to verify dumpcpp generates working code. Task-number: QTBUG-26587 Change-Id: If12d2301890c209e7fbcb3bc054791a1c9d492c3 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* ActiveQt: Add support for setting properties by referenceJonathan Liu2012-02-204-0/+85
Add support for setting properties by reference to allow properties that can only be set by reference to be changed. Change-Id: I2f39f8720ecd1ba97139ab42756d686db2211cad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
View Lorry Controller Status