summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-113-8/+57
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic8e3766553bda7745290a39db8ff28e15c0dfe4d
| * Fix history state index handlingJuha Vuolle2022-11-022-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I196739d4802316156e3dc5b9387d2ed3f39d94d6
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: If6529900c7584168fbfc66cfea1c0692406e1ba6
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I64ae6813d7c08e9714bbadb7064ef67878c13290
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I52c8c15ef7203c93dd3b5fcbbf874816bb011a4c
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I8dc5e366886b1f1116d4c71ae206d77e4f4f143a
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: If6995e6a97f7e3482f0343b4860f51eb3e7aa78e
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I6bde446ff1611e48477fc14515a4c16ce5b15466
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1a3bd833400cb7e924ceb874993ac6231e36c1ee
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-198-29/+178
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0ca57eebe4b56fcad4e0af474b9b409e79a5c6ef
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I2d44c92890f429548ca93905e2364610694016af
| * Fix calling of the overloaded Scxml statemachine methodsJuha Vuolle2021-05-077-28/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reverts the commit 2951c124d3ff58abe1f84175e512ba26977f13d8 which marked the dynamic statemachines' metabojects as fully dynamic. The marking was done to prevent stale accesses via QML property cache. However it introduced another problem with the resolution of the QScxmlStateMachine's overloaded invokable methods. The result was the inability to call all but one of the functions. To address the original issues, instead of the dynamic marking, this commit invalidates the related qml property cache during the dynamic metaobject's destruction. Task-number: QTBUG-89521 Task-number: QTBUG-92367 Change-Id: I5d206558bb052b27b2764a80c4bcbe6410c07b22 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6e4f26463ebfaf267cda80767943b314c7953f50
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: If2377076a51081b6e8d6c45f94fc6a4750bbe842
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2355-1053/+1053
|/ | | | | | | | | | | This reverts commit 167f01e4be56440cb58e97510bc408f3476eb307. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I5da8856fa2cee8270c25ff550d1538a939e4837b Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Mark dynamic state machines' metaobjects as fully dynamicUlf Hermann2021-02-031-5/+27
| | | | | | | | | | | | | | | | | | The memory is allocated using malloc() and will be free()'d eventually. Client code cannot expect to keep string data from those metaobjects around. The QML engine will avoid the creation of property caches (which hold string data from the metaobject) if the metaobject is fully dynamic. Therefore, just create a QAbstractDynamicMetaObject that wraps the original metaobject and pass that to QObjectPrivate in order to signal the fully dynamic nature of the metaobject to QML. Fixes: QTBUG-89521 Change-Id: I349dcb689be5674679237a551ed8595bd6b5b672 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 0e4c91654abff279b51238b46f880dd624ab9ec8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2021-01-2755-1053/+1053
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtscxml. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4220 Change-Id: I5705f5a36a3549b6db8aebe88149c2c4063dd2b4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Ic3e00fef227a51da115cdea98f0baaa9da39cdcc
* Add changes file for Qt 5.12.10v5.15.2Antti Kokko2020-10-191-0/+28
| | | | | | | Change-Id: I15554d4f7878f89c15dbd22175aee902086b938f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 878112bf670bb9f9caa09de290c63b0f9078d3f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: Ie8572003c1e8db62cf6a2d65e360b4d7f30afb6d
* Add changes file for Qt 5.15.1Antti Kokko2020-09-011-0/+22
| | | | | | | Change-Id: Ia632da30fcddee81d73e7884696338f116931bce Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 38095de1942031707b05709b160e1399ecbf8276) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix error checking when attempting to connect nonexistent statesJoni Poikelin2020-08-211-1/+1
| | | | | | | | Fixes: QTBUG-85710 Change-Id: If2e47df053d7c86654b57a9995b9ea4739475c81 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 0299c25208c130d148d75d071168fc5c2ffc4bbc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix flaky autotest with a delayed event in scionJarek Kobus2020-08-101-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the historical fix for the issue (commit 3da30ee8928ab27249a74966ed4981766d62ff25) the playEvent() method submitted directly the delayed event and it tried to verify the configuration just after. It couldn't work, since the event was delayed, so the demanded configuration couldn't be reached yet - it was checked too early. After the mentioned fix, we didn't submit an event immediately, but waited demanded time (in hope, that statemachine reaches the configuration expected after a delay) to mimic the delay, and after that, we submitted a non-delayed event directly. This could also cause issues like these mentioned in task description. The reason could be a race between the point in time when statemachine issues the delayed "s" event and the point in time when we submit the "t2" event. It could happen, that we submit "t2" while still being in "b" state (so before the statemachine issues the "s" event), and in this case the "t2" event doesn't trigger any change in the statemachine, thus the configuration stay unchanged. In the current fix we go back to the original idea of submitting the delayed event directly, but we are delaying the point in time when we do check the configuration expected after the event is dispatched. So is case of delayed event we connect to the statemachine's signal emitted when the event is being dispatched. After the connection is established, we submit a delayed event and start awaiting for the right moment when we should expect the stabilized configuration. This will be signalled with a timeout of trigger timer object. When the submitted event has been dispatched (after the desired delay), we connect synchronously to state machine's reachedStableState() signal. When reachedStableState() is received, we trigger the timer to unwind from synchronously called slot and to get back to the place where we were awaiting for timer to be triggered. Now we should expect the right configuration. The above approach works nicely also in case of playing non-delayed events. Fixes: QTBUG-83420 Change-Id: Ia6ddbc6ac9282a2dd41e0c99dd1bb59610690c95 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 2427b675711119c6aac68b662434eb8a0910c3a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Qt 6 compatibility: QMap will no longer support insertMultiThiago Macieira2020-08-021-1/+1
| | | | | | | | | | Just use insert(). The map will no longer have multiple values for the same key, but those weren't accessible from QML anyway. This may change which value is reported in QML now, but the API was already bbroken Change-Id: I99ab0f318b1c43b89888fffd160b5ea0c1a9e170 (cherry-picked from commit 98d5b12c39ea442f3826ac2cac345b9d5422f61a) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I0a0d2c3020124e495f6a9790379d69887e2b082f
* Fix warning that the QQmlListProperty constructor is deprecatedThiago Macieira2020-05-202-2/+2
| | | | | | | | | | | | Use the one that isn't deprecated. invokedservices.cpp:119:12: warning: 'QQmlListProperty' is deprecated: Use constructor taking QList pointer, and gain improved performance [- Wdeprecated-declarations] Change-Id: I99ab0f318b1c43b89888fffd160b5b4521f09ca9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 777bcea74700d22a11d958b1eadc87669116a9ea) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Ifc5017f6701724361884ba5e90b6b47d8647834c
| * Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Antti Kokko2020-04-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | + 1b555247e953d9be2b442f281698df475ad9fffb Bump version + c172655a2d9d3b3a8948ee603ad39613ca5ec778 Fix usages of text stream operators + a6d3c194fb0ea676d85dddf1fd005f169391666f qscxmlc: Avoid QHash::unite() + f66312ce38e083d8c1873b7c61702b2e88f229b1 qscxmlc: Use QHash::insert(QHash) + d9885834b4c7b4f0d5c960282bf982c0fadf0e21 CMake: Add Qt6 forward compatible CMake API and targets + 78eac0c12128ed1884b0c35e1191a9646df60a3d Update plugins.qmltypes for 5.15 + 61ed1a9e09fe54b0d52afbf865de03c8c4eaed82 Use Qt::SplitBehavior in preference to QString::SplitBehavior Change-Id: I96b34fbdf8077db35ed5d9e02e7c43eaa6ef7f0a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: Ib91afe9acd2431f90635604b2e4e24d8c3c98124
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | |/ |/| | | Change-Id: Ia71357ca1548cc94ae5e2e22795c50e04d53bb62
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: I9206b5a8fb38442800aa9870a091c16ce48f68d1
| | * Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ | | | | | | | | | | | | + 2ac294443a72799c021dcf3513c83fb628f3c193 Bump version Change-Id: I6e31159f1278156aa32f300d90fb379f97e5c304 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Qt Forward Merge Bot2020-03-071-2/+2
|\| | | | | | | Change-Id: I78c3ad6d284c1cbb582b02c633fbc064d68349d7
| * Doc: Fix highlighting of QML importKai Koehne2020-03-061-2/+2
| | | | | | | | | | Change-Id: I852154d4c876c16e6aca6c77e864c8d84f031b39 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-7/+7
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I022d0c59b1fce62378a89c8f4087aaf99d3aac8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: Ie422360ad630ab0a7f265a00f868ea2511858c3f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I413d6fb9aeabc1ae327ed58b74172df00dfa8d61
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I4e4daf8b59a6ace1b150ddaba74f4eca6e4e7455
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: Ic64a85d63d57884bc2868c54adb422a2d868c0c4
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I8719285d1f644d3e69d1483fdea802f6ac048455
| | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | | | | | | | + 70a3d70b16c5902d3d9afca97029821d36ce31bb Bump version + a36ee0bd14f528238c8761265d934e29268e2dbe Use "QtQuick.Window 2.2" in calculator-qml Change-Id: Ic55c159da040d3d27a960354f6aeb48645f34f36 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | CMake: Add Qt6 forward compatible CMake API and targetsAlexandru Croitor2020-01-242-0/+22
| | | | | | | | | | | | | | | | Task-number: QTBUG-74137 Task-number: QTBUG-80477 Change-Id: I4986f1d9eea76dd4c99d0ad9a39fb59176a88ace Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If00801df901692a93d851f97715facd2b1a167a9
| * Use "QtQuick.Window 2.2" in calculator-qmlAssam Boudjelthia2019-12-181-1/+1
| | | | | | | | | | | | | | | | With version 2.0 the layout is not correct on Android, version 2.2 works well. Change-Id: I7df2d8ecd0e623fe437d9a47e24b8557651f1e1e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 11:42:53 +0000