| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I4cb795e3aee71e3ca109c21af3373d3de6cae227
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0493b9aa5ad2b42d022234943f7265057d5bfeaf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I28cd06b137f5884b39f8c88dbcf505427ecb078c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I6a8afc16b5c97ce634dad6b33008dedab6f24447
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1d6b2d796cbf94a787026298b238ffd68185ca9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I5a3184d5e309bcf57bd758af4a897539b3503de6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I8da291597c2674b35341f752c8d8688b8924151d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The split into "animation" "graphicsview" and "statemachine"
sub-directories is a reminiscent of the times when the examples were
in qtcore, and as such not very meaningful when state machine is
in a separate repository. In addition remove similarly inherited
READMEs.
Task-number: QTBUG-111447
Change-Id: I8f3d977512fdc239bf3dede341f69788df0a09f4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit f00f576c95fc99e9bfebdb5d6e321360db1b7eef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
As part of the Qt6 example revamp campaign.
See QTBUG-110646 for more detailed rationale
Task-number: QTBUG-111447
Change-Id: I9757daed4a3e60a15cc0b557c14e51862c6b0bf7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 236d927705defbf58a6b410befcf73a141d06c4e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4dbf678dbca1d8215ab15f3a359db8d853139a02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Iba3170c47a169189cc8a926536ae6564000eef60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I15917f5af9b4bd223b21434c659d003083080954
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Rename the scxml 'calculator' target to 'calculatorscxml'
Amends 7801e05e659845ccc163c7e473ed4d91fa1de778
Task-number: QTBUG-111090
Change-Id: Ic86f342a4407b9b79896262d8f990b8eb3536e4d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Rename the scxml 'mediaplayer' target to 'mediaplayerscxml'
Amends 1eb77736b2e72bfcbdc356e183e3cbb0f09d71a1
Task-number: QTBUG-111090
Change-Id: I744624cb2b7547f03a8867b28f0301b1431b64c0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
According to current example conventions in
https://wiki.qt.io/Qt6/Example-Guideline#Naming_the_example
Task-number: QTBUG-111323
Change-Id: Ib7f13bd1a147168c6df13b126daac4bf1daf405d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 2d6788cc68fd1cfafa5850da50c6eab80e26eb31)
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-111090
Change-Id: I20b5f98aa190f2f13bc1a2764a48d6afbf37ae8b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 0fa13e27df59d0db384f03ddedc0798a35a5dfe3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
To reflect the technically unique aspect it demonstrates
Task-number: QTBUG-111090
Change-Id: I7f7558202292ff613a67b6c64cdab8368854dd94
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 81a08c83bc4a581adfb185d663a955585274c829)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ibb54fe047acb9b996eb48144ea9223e6b034dd7c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The calculator example is a rather generic SCXML example, but provides
demonstrative value as it implements the calculator from the SCXML
specification.
This commit removes the widget variant and renames the remaining QML
variant as plain "calculator".
Task-number: QTBUG-111090
Change-Id: I6ecdbe9de49fd357c91e25c9d0fe31fdd7958d7e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 7801e05e659845ccc163c7e473ed4d91fa1de778)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
The primary purpose of the example is to demonstrate invoking, and
one example variant is probably adequate.
Task-number: QTBUG-111090
Change-Id: I1f8a64be3bb82c9663687b7f37cf6682e0626060
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit a21673b4315f9fce913a9c7bc513102874e6777f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The most unique aspect the mediaplayer demonstrates is the use
of cpp data model. This commit removes the other variants and renames
the remaining one as plain "mediaplayer".
The two QML files (one from common and one from the original cpp-model
example) were united as one, as there is now just one example.
Task-number: QTBUG-111090
Change-Id: I450ce5b23df072be34dcbc3c109d10e6b45709da
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 1eb77736b2e72bfcbdc356e183e3cbb0f09d71a1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
While an admirable state machine implementation in its own right,
perhaps doesn't provide adequate unique demonstrative value.
Task-number: QTBUG-111090
Change-Id: I47c1392bf5ac30f7b0b8a46b5539cdd333d77610
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 74428c29dc8c81d17e1a666bd271572206ca7e97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2ef8565cfdb9c8d629e2fa2c0ee05acb76f3c742
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-110352
Change-Id: I6ca9b1412d8206413a8ec1137413132e37bccaa9
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit a2c7d7737c10fd88f1ab757e1fff741ab496da96)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Iffa9ab0f31122abd769df74f369249cc84681bd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-99238
Change-Id: I68008cf74ebf7586f0e65005ffbce474a2890146
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1b5562d67764eb7bea28fc4a2fd357810ac1a859)
|
|
|
|
|
|
|
|
|
|
|
| |
When models are set to statemachines with
QScxmlStateMachine::setDataModel(), the state machine does not
assume ownership of the model.
Change-Id: I18e69f8c34906719b7f729eab7d46d271cfdf950
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 64df2a22287fd824e4690272c204d77a52562f53)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2f5892dafe0f496bfa50e253ebe0fb6e2e72d926
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ifbee6465ce303272fef49e0a690e3ebd8d2a2734
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2fe5881da830124e46d7c5bf10a9acdcd2a4b172
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ie48da1eaab7542f242869a254bce9e6b258044b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic98575e82ab44abb35be39a0b02e8f4b77bb0832
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I7910b1df47150490d2255a3ef00ba0b668562032
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I35ae2bffbe71707907b9ec5520d67f660c853a12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Option has not effect anymore.
Change-Id: Id293e8c88f5b0b3c166364217e9974f0820c974a
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 8afe58c4334e74524bf7b322ab814a8916aa9a3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ie090f3fc132c853e542ead57d1819918f8c5256d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Id7acdd5393ff04de2d948a1ac818fe996613996b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ide6aba30d577eabe1503010e964ccab9231721aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2e6db124b175a4f79b16a89499daf3fd017c18dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I974ea996ade5af5d61a450ec21185410dc299565
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1976468497ef9445ec92caabd8898b5638f5d2c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I745d31473995cce228685e25dba6eb37e542d181
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I6e499fb0d6c26e0ad66599751e01e6ef03bb170a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I169b51bb532a7a4ae07431acdc9e5232a43df450
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4566424912c02bae613160554dd7daa40d6c5614
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic66c81efa3311549c1e70eb733d7efa72fe69c73
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I140f8ee85a9499f277abb66dcdb2157ca8741e27
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I914ccc09297ac6283d7cf24d5afc96ebdaf294d0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|