summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2' in qt/qtscxmlv6.2.0-beta1Qt Submodule Update Bot2021-06-301-2/+2
| | | | | Change-Id: I2bfe108ce08ce4a9f9c31d2d234afc380bf9de93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-291-2/+2
| | | | | Change-Id: Idbb4d8fdc5639d64a7e039897059d026b5fe8491 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-261-2/+2
| | | | | Change-Id: I0a829f0f6dc40bfa4f166ff840119ac26bb765ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-251-2/+2
| | | | | Change-Id: Ic227d7a51169a7638991e2201f0880d23b1a5de3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-241-2/+2
| | | | | Change-Id: I7556130ddb8ce8e768cdce49b83aebc533526f25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-231-2/+2
| | | | | Change-Id: I598c5482aec00f4f9a79cdb1faa5912bc293b000 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-221-2/+2
| | | | | Change-Id: Iea97df2e89c1063db7f32f5cf8498c61781b9b72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlv6.2.0-alpha1Qt Submodule Update Bot2021-06-211-2/+2
| | | | | Change-Id: I93ff87a289d8d1fa2b09e7ce4900265cdb611ca2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qtscxml: Add QtQml dependencyMaximilian Goldstein2021-06-211-0/+2
| | | | | | | | | The QtScxml module needs QtQml as a dependency or else tooling is not able to properly resolve its types. Change-Id: Ib9e8d7349e6fc0a43c6690c79d30e985ca0e856c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 66e9946247600657570bcd2c6a53d90fc857402f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* statemachineqml: Add QtQml dependencyMaximilian Goldstein2021-06-211-0/+2
| | | | | | | | | The statemachine module needs QtQml as a dependency or else tooling is not able to properly resolve its types. Change-Id: I436456ba9e9351d04af0364fc98618a44e634edd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 1182a4acded8f19d803a1aac626170d5f9ddcd7d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-211-2/+2
| | | | | Change-Id: I7ea3465447428ecc6f44f18d2dfa0916b56d85d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-181-2/+2
| | | | | Change-Id: Iaa46c5396592553f63d681b3734cc1c1b9979c04 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove old configure-related filesJoerg Bornemann2021-06-173-45/+0
| | | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Task-number: QTBUG-89536 Change-Id: Ib0c67ef861216f4d64a00c80ed0a9366eab8f262 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 782a5948f0d38d77c9f0d2c1ce951cc8cedb540a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-171-1/+1
| | | | | Change-Id: Iadc4a6d5843cc3e9b73a2b2823e80b0c74ca035a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-171-2/+2
| | | | | Change-Id: Id6216a7fa91e0d8b8ab25ca64dd0ce8255630227 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: I3d7c5aa947fef571a6dd140ef6ac2d5eb9814561 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: I4809dc89c593a891304d010e035b7b1d9bc9e067 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-161-2/+2
| | | | | Change-Id: I901c74fba70e0e1103d8af0ef95f351eaeb1f8e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-151-2/+2
| | | | | Change-Id: Ia3920080fb17fb56275427f8ea51698576976f84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtscxmlDaniel Smith2021-06-111-2/+2
| | | | | Change-Id: I2ff803dff639c11e721d1f898359c2b92c0b5349 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qtscxmlDaniel Smith2021-06-101-1/+1
| | | | | Change-Id: If05ff5eceda5255c331a6a5fd57dc87e30aa07e8 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.2' in qt/qtscxmlQt Submodule Update Bot2021-06-101-2/+2
| | | | | Change-Id: Ie504f8bb7d0f65c9a6c1628311423997fee48fab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not invoke bound signals with QList<QVariant>Ulf Hermann2021-06-101-2/+26
| | | | | | | | | | This method has been removed in QtQml. Fixes: QTBUG-94386 Change-Id: Id3f95787dd34df61e89e71b7ec700e1cbbf1b3f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 805eb53f97b0eb3ee71ada360c56cca10dc827bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-071-2/+2
| | | | | Change-Id: I77638ae801622c1b104c15315284ebbf0eadd242 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Define repo target sets for the conan buildJoerg Bornemann2021-06-077-0/+17
| | | | | | | | Define the repo target sets qtscxml, qtscxmlqml, statemachine and statemachineqml. Change-Id: Id6ad659c942926e71027a108b9089d92bc5b2274 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: I448575bb269d01bbb732ff210fdb80fbe5f1c79d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: Ie61f601801e1c1390581288afca5f20d6b739bfb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-051-2/+2
| | | | | Change-Id: Ib284762727c3b62178d73b1ed07c1a8c8b631060 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Don't use internal compatibility APIAlexandru Croitor2021-06-052-2/+5
| | | | | Change-Id: I96ea9ed25824d7fdd495686f4224dd1391353e7f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* CMake: Update to latest qml CMake APIAlexandru Croitor2021-06-059-202/+10
| | | | | | Task-number: QTBUG-91621 Change-Id: Iac28e71b7e581aa7199d4d3b3890b6d5f9d6c8eb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-041-2/+2
| | | | | Change-Id: Idf2f63f76163f63b23fc8c5f757efa872ab008c5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-031-2/+2
| | | | | Change-Id: Ib5adc2cf4378a723a88a25040e918fbcb2164e3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove mentioning of possible third-party licensesKai Köhne2021-06-021-6/+0
| | | | | | | | There are currently none :) Pick-to: 6.1 Change-Id: I4c253d7d1cb2980d2174e7d0eead4795455dcff7 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Fix debug-printing of lists of QScxmlEventUlf Hermann2021-06-011-0/+5
| | | | | | | | | | The previous code only worked because the relevant QTypeTraits templates were only instantiated after the first operator<< was defined. We cannot rely on this. Fixes: QTBUG-94125 Change-Id: I86e1b146cf83e337c87893ef0e2dc02e7edb3671 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I34614094e3b1d2c0a2618a002653f9c4d3bbab7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: Ic9ab834d2867ddfbf2beef2175b2928e1ee83372 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: I28ed8a63639f703f9afe420612fcd359602d62ed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-271-2/+2
| | | | | Change-Id: I07a8dd549a72e262fa118025036c37a0b3b38b51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix autotest compilation error on Windows/MinGWJuha Vuolle2021-05-262-2/+12
| | | | | | | | | | | | For some reason with MinGW the statemachine code generation failed silently if the provided output directory (where to store the generated .h and .cpp files) did not exist. This commit creates the directory and also adds a warning if nonexistent directory is tried to use. Pick-to: 6.1 Change-Id: I161d7646b4be5bf52fd045d0bf124ab2f8987668 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-261-2/+2
| | | | | Change-Id: Ie786ac25797b733295bb2d9c36fc297f382c1270 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-251-1/+3
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7 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/qtscxmlQt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: Id1bdb50bae7b4e59c83ec1bf639cfaf556c82b1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: I805d0f2d3d18eb5753b4035931c6600daa70a6e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-231-2/+2
| | | | | Change-Id: I876902a38cf7136118d4f260a3319f76a4bda762 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: Iace1959e1dded6f17fe5af7ffb4c99ce404925b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I8286a7e4b6926b6bfc77488bab104d7845f2a61f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-191-2/+2
| | | | | Change-Id: Ib661ace2d1c6ab4c1e46833c794478262147c40f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing find_package to an exampleJuha Vuolle2021-05-181-5/+2
| | | | | | | | | | | | The find_package was not done for QOpenGLWidgets. This worked ok while building as part of the repository because the package is sought at the toplevel CMakeLists. However when building outside of the repo it is necessary to have. Pick-to: 6.1 Task-number: QTBUG-92541 Change-Id: I3b69925e7c8b22ff44507ee6103f34e82787a227 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update dependencies on 'dev' in qt/qtscxmlQt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: I5666cf690af76878724634c0b9b42155353d1334 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix duplicate autotest target nameJoerg Bornemann2021-05-121-3/+3
| | | | | | Fixes: QTBUG-93727 Change-Id: Iadd798d06eca246947b105a3ad1aef11f80917b2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>