| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
| |
Change-Id: I812be3e54b69b0921a73fe476099a0a3d52bbfbf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ib9b139e152cd4597bdb3d805d8cbb47769e1cf46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I6285c56b9582aa34202cb53fcd1f50ae74db62ff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I63906d829717ed0609973b8a2597aec107b8a54a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I78800cfa6f3c79cd7b431dca814adfd9afb9fcac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I5dd85f9bed9c456864ee75ff52094e4b4e540e90
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I10c3f55ae5db906c20de572b77e592fa6897ba4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ie7216048a9697eb30d7b8361e3adb7310ddb24e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I62064f14b52d9c75cfa4a7712d3ebe819d7cb3cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
The qmake include snippet id was wrongly copied from the cmake section.
Fixes: QTBUG-119562
Pick-to: 6.6 6.5
Change-Id: Ibe4553e42434f40abc168a614d1d7de2a60140a3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
| |
Change-Id: I6e84b78e7a8814603b57104aca214528856e4c79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I63d1f4da650ce9b9175ffea094eb3d8b081c5412
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I11491c80b3e6a180956823af2b53bd7b796d305b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I66322bf25272607a403147e51bf969a98db1ed6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I8b580da3b4c9e4038f3928e943e733678a2c83e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I704bd61766f351720cc06bc4d12e5b0a06019410
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Id60dbd877c6a19e9b742c3ab0470af9f4c72eff1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Amends commit fc213f255b1a82
Pick-to: 6.5 6.6
Task-number: QTBUG-117220
Change-Id: Ifd3a309b90a7810c4da1ff7530c80dc654f04c35
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
| |
Change-Id: I656b68460dbb3c1a1ae766e84ee5c352ecab005a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ie49a43a1694f02c003f6ffa88b18ac0ee4ea7588
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Id0875f239d145834d9738a832b1039bc90f60a06
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Icf1b90375608684e872a38a49d687c3f6a0e1e6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Standard says https://www.w3.org/TR/scxml/#script that there should
be either src or some content in the script tag. Compiling should fail
with non-conformant .scxml files.
Adjust the number of the errors in a few test because of newly added
error.
Pick-to: 5.15 6.5 6.6
Fixes: QTBUG-118050
Change-Id: Ib72f7cca53e427a5a83a6aaa3a8a197818e8693f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
| |
Change-Id: Icbe8f58c6f70f906ce81b4f064765d6cbb90b58b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic5d63f262e7cc0cee09e4023ab59215eaf8251b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I03ce08bd88525586e2563924393b278cf8a051a6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: If61523d34af9c665e90fecad9b7d60015236c22c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Pick-to: 6.5 6.6
Task-number: QTBUG-117220
Change-Id: I7d9a6e47c7115a39ab19e7acb3d9a8940fb9b948
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
| |
Change-Id: Ic12f35eb1ce63aba65504c8c599852d14041f848
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All these TUs relied on transitive includes of qpointer.h, maybe to a
large extent via qevent.h, though, given that qevent.h is more or less
the only public QtBase header that includes qpointer.h, something else
seems to be at play here.
Said qevent.h actually needs QPointer in-name-only, so a forward
declaration would suffice. Prepare for qevent.h dropping the include.
The algorithm I used was:
If the TU mentions 'passiveGrabbers', the name of the QEvent function
that returns QPointers, and the TU doesn't have qpointer.h included
explicitly, include it. That may produce False Positives, but better
safe than sorry. Otherwise, in src/, add an include to all source and
header files which mention QPointer. Exception: if foo.h of a foo.cpp
already includes it, don't include again.
Task-number: QTBUG-117670
Change-Id: I8bdf99ae10f7a4430cb23c7a0a52ef646bae750a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
| |
Change-Id: Ibd9131141ca8cf54ac46703c44a8d9f9e7e00079
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adjust to the changes in QTestPrivate that allow to catch binding loops
when testing bindable properties.
Fix the binding loops identified by the updated tests.
After fixing all obvious binding loops, it was discovered that the
call to QObject::objectName() in the tableData property setter creates
a binding loop on its own.
Fix it by accessing QObjectPrivate's internals instead of calling
a public getter.
Also add a test to verify that the logic of updating the objectName
did not change.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: Idc849dd9841dc70df2d36524cb5bb0a331255f39
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All bindable properties were not breaking the binding if the new value
was the same as the old one. This is incorrect, so fix the logic.
Also, use (set)ValueBypassingBindings() to access the properties.
Update some helper functions in QStateMachinePrivate to also use these
methods instead of directly accessing the properties.
Some of the QState's properties cannot really be tested for the binding
loops with the current approach, because they require that the new
state belongs to the same object. Explicitly pass a lambda that returns
a nullptr as a helperConstrucor parameter for such cases, meaning that
binding loop checks will be skipped. In practice these property setters
are trivial, so they will not cause binding loops.
Pick-to: 6.6 6.5
Task-number: QTBUG-116542
Change-Id: If02c35df2b9c651c7f21f6f85752912e56688c71
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This one is a bit special, because the setter assumes that there is a
QML engine handling the object.
As a result, creating a helper object for testing binding loops is a
bit tricky. Do it by having a helper QQmlComponent based on a qml file
with a SignalTransition object as a root element.
Fix the binding loop in the setter in a usual way.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: Ibd22dee0619a69b52901e9fe2145fcfbd9dcf98c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QScxmlStateMachineLoader::source setter assumes that the loader is
managed by a QML engine, so use a helper QML file and a QQmlComponent
to create a helper object and run the test for binding loops.
The binding loop here is a bit tricky, as the source setter modifies
two properties: source and stateMachine.
The fix for the source property is trivial.
The stateMachine property is read-only, so modify the
setStateMachine() internal setter in such way that it does not create
bindings. After that, manually call notify() if the state machine
has changed.
Use simpler state machines in the test, because the original ones
were generating the ASAN memleak warnings from scxml compiler.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: Ia8427ed07c1e63e5740b2f0817fe6b2cb48726b8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
| |
Change-Id: Iadb9f678c86f178651e4aa42a2706b9d1a413411
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
The QState::removeTransition() call releases ownership of the removed
transition, so we need to delete it manually.
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I324348af2e63e242e3d9a69fdbd83eefb94bb852
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
| |
Change-Id: Iea686f49f032338bce0a3e74cf6d9eec024ff9b4
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
|
|
|
|
|
|
|
|
|
| |
Wrap the created objects into std::unique_ptr, so that they are
properly removed.
Pick-to: 6.6 6.5 6.2 5.15
Change-Id: Iafeb04034b9c8109f2a1cb112e889211a6ac2e68
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
By using (set)ValueBypassingBindings() in property setters.
Also convert the helper function doConnect() to use
valueBypassingBindings(), as it's only called from the setters.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: I6ab241c26d377b62e99b46b3295cfa48ef5f2a7b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
| |
By using (set)ValueBypassingBindings() in the property setter.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: I21cf04b43e1c1e912117ad5e4cbec9e9f1a68f43
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
By using (set)ValueBypassingBindings() in the property setters.
Remove the dependency of initialValues and dataModel setter from
the m_stateMachine property.
Task-number: QTBUG-116542
Pick-to: 6.6 6.5
Change-Id: Ic16e7fde2b319d4c3b3471356e69be8e61d9806f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
| |
Change-Id: Ib262e272cef99dc1c68c4bc6e0f2111430681202
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4e98ce0897a3063622b57142392e5dab791c35ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I97026ec2f1158b0e09f61c6e043aa514ebd1bdf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: If67cf9507dff0b419e6d05e59265ff5bd8c1edc8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ieec5236510f57a3049162d3355041f39ff8f51c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1020b0360b881296c9f84bd1154a2b9017a5dc4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I3de2fefe90cfb4ddd6ceac1d1b4f4606d85b3781
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I7481b452561101ad81c374889ecb58933800d4dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|