summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4' in qt/qtscxml6.4Qt Submodule Update Bot2023-02-211-2/+2
| | | | | Change-Id: Ibfa5920318d1818f308ca00b06bb998ced877d86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-02-131-2/+2
| | | | | Change-Id: I42184651194eec7ea8aac4bd68e143d3481f8f4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-02-101-2/+2
| | | | | Change-Id: Iad20ffdbe668708bfad30b7353d19f387cc7d998 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-02-021-2/+2
| | | | | Change-Id: I0bc9067d032d9fb49b6957162e51691c6336a0f4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-311-2/+2
| | | | | Change-Id: Iabed803f3ec22385fe4c20402c547695c84960b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* StateMachine: Don't crash if no signal is passed to SignalTransitionUlf Hermann2023-01-252-1/+9
| | | | | | | | | | | Rather, just reset the transition. Fixes: QTBUG-110286 Change-Id: Ic25a6c7b841a47b180e1a62c7bdbd2e388cdc293 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit af4c8da54bbf057f3a8d7cf8a8e4146d35aad7f6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-251-2/+2
| | | | | Change-Id: I9ad869d3ac25bda9a7a1b29acb63bf6eba492136 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-241-2/+2
| | | | | Change-Id: Ie30a5810c6576beacdcb90aaf46372380b9efcd0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-231-2/+2
| | | | | Change-Id: I332d94fed22dcdacfd7aa049a078c5d31e465d62 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-201-2/+2
| | | | | Change-Id: Iff2de5fcfbf0c0726060bb709ddc44708c8b8ab7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-181-2/+2
| | | | | Change-Id: I534c4f4b439773f34b93ed7be67d7731b9c7b6e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-171-2/+2
| | | | | Change-Id: I6b4ea771bb087f480e9303505134eb70417e85e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-161-2/+2
| | | | | Change-Id: I49e59e0c8f1465dccdd0cb4a725c3806d10bd951 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-131-2/+2
| | | | | Change-Id: Id73da2dfe316d138f849afd9e51e6a09925314e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-091-2/+2
| | | | | Change-Id: I3f4fe6a54474541fc5a3d1a5207c604d07ead42d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-041-2/+2
| | | | | Change-Id: I4baf112a6a13b9fafce5d92ed0ca8c5dfd11ac17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Partially update moc copy from qtbaseMarc Mutz2023-01-031-1/+2
| | | | | | | | | | | | | | | | This applies qtbase/b8c2a0c18a0676595946b5543ff88492a5fc7876 to the copy of the moc code used in qscxmlc. The moc copy here is severely out of sync with the qtbase version, so just running update_moc.sh produces a lot of conflicts, which is why I only applied this one patch. Created QTBUG-109556 to keep track of the rest. Fixes: QTBUG-109235 Change-Id: I9e033453928110ac2aab1ecd6cde824c6abe0a97 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 6e69b40526e4c69b9b46e06a104c5b8a27c61544) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2023-01-021-2/+2
| | | | | Change-Id: I7a8b199c4ff23b8f479bfaa28497fafd55492f59 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.3Jani Heikkinen2023-01-021-1/+1
| | | | | Change-Id: Ifeaf57ce78cb4cfd8de7ce13d031fd686e79145a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-12-291-2/+2
| | | | | Change-Id: I5deb6a4b197f2c410105fe3b6ef77cd6743ffeaf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-12-201-2/+2
| | | | | Change-Id: Ia59116d83c411451534fac444b4c6827a8826685 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-12-061-2/+2
| | | | | Change-Id: I59ad49da3774f07d880ab266a9f0acf3e1b20057 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-12-011-2/+2
| | | | | Change-Id: Ifb42af34404d24d980d001c38b4435d07cdcc8f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-291-1/+1
| | | | | Change-Id: I4adefe9d2e77c290e5f7380e964195b323ea149c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-231-1/+1
| | | | | Change-Id: I2874924a4aff00e03f842701ace9b448ef1df447 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-211-2/+2
| | | | | Change-Id: Ib50a940f25cea7e480a5c557c9e036dcbd20802a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-1813-40/+40
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Port from container::count() and length() to size() - V5Marc Mutz2022-11-1818-326/+326
| | | | | | | | | | This is a the same semantic patch (qt-port-to-std-compatible-api V5 with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to avoid cherry-pick conflicts. Change-Id: I9621dee5ed328b47e78919a34c307105e4311903 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-181-2/+2
| | | | | Change-Id: I5e6f2d709062bf9c2a017a09b18e9fb15abdd121 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-141-2/+2
| | | | | Change-Id: If8f86fed5b3abc62371e8fffda57079a44dcfe13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.2Jani Heikkinen2022-11-111-1/+1
| | | | | Change-Id: Ice1b6ffc8aa929699b2fc6c68a4b0afbe4e8d270 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-111-2/+2
| | | | | Change-Id: If4b2a32606e8d154b79049f3ffedd2b4ed17b5ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-11-041-2/+2
| | | | | Change-Id: Ia3748ce93cd5938fcb60fa33146cd48c8f96c6c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix history state index handlingJuha Vuolle2022-11-012-7/+57
| | | | | | | | | | | | | | | | | | | | | The history state is not present in the generated statemachines, and the states following a history state have a state index that is lower than what the actual statemachine considers. This patch adjusts the index calculation on the statemachine side. The scion test suite history tests passed because it used the activeStateNames() method for verifying which states are active. That method worked. This commit also now amends the scion verification to cover the metaobject access and (de-)activation signal emissions; the scion history tests would now fail without the index handling adaptation of this patch. Fixes: QTBUG-80262 Change-Id: Ifc509794bf3dca6c81e969e8a4e2bbaf9618d275 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 50815b095f1ccea936c89964e390e7e774efbf4b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-311-2/+2
| | | | | Change-Id: Ie01a47d506f915213b2953d53ba692eca5c06bcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Use new _qt_internal_get_tool_wrapper_script_pathAlexandru Croitor2022-10-282-6/+8
| | | | | | | | Change-Id: I3c8422f4568fc60cf6cd3c247e008cacdcb18249 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b56f34ca6c24e440174c3c249594914cb470731b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-271-2/+2
| | | | | Change-Id: Ibef97e87440c552c828271241c7e9bc26c773341 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-261-2/+2
| | | | | Change-Id: I8e0c47e37864843c25c2557defe063f1168edae9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-201-2/+2
| | | | | Change-Id: I7537d52aa7b03a0db41aea4f0b94a179b50fe93a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-191-2/+2
| | | | | Change-Id: I2cbb188edbda4762b99dc0f4732bd48500e7d676 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-181-2/+2
| | | | | Change-Id: I4cf1bbd93da3becf496a75198c258e4008dbb939 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-171-2/+2
| | | | | Change-Id: I23cb2504e4440cbe96a4ef23576161f59e2bdf32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Update documentation on how to integrate with QMLUlf Hermann2022-10-171-1/+6
| | | | | | | | | | You should not use qmlRegisterType() Fixes: QTBUG-107209 Change-Id: I98c3c84d3e6d1334eedef98a55ead7c2adef89e1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a7e44fcdcc463f2698c5c896fa64f66b72837151) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-141-2/+2
| | | | | Change-Id: I9503c3582108f62a8ff0b855583093066f340019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-131-2/+2
| | | | | Change-Id: I38859ab627b6379bbe739550d61917f1a1f3e155 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-071-2/+2
| | | | | Change-Id: Ifba45edc7376d6f427039d2195cba67cb87ef1e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-061-2/+2
| | | | | Change-Id: I64a0a59a76c93495d2c6177522bb9aa40a632717 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-10-031-2/+2
| | | | | Change-Id: Ic220e3be29c89fe10a1452d1cf9b4e3e46d4000f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-09-301-2/+2
| | | | | Change-Id: Ief834ce5aa4f7fa59fdff921cdaddf9cccfaa307 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtscxmlQt Submodule Update Bot2022-09-291-2/+2
| | | | | Change-Id: I86f7a373583c0a9853f697712f2c7246e8a1a248 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>