summaryrefslogtreecommitdiffstats
path: root/examples/scxml/calculator-qml
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* QML code improvements for examplesMichael Winkelmann2017-09-111-5/+8
| | | | | Change-Id: I0f7bfc749e41071268d107d3250910de918a2d0a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update plugins.qmltypesUlf Hermann2016-09-271-1/+1
| | | | | | | | | | | | | | | Also, have the extended state machine type follow the usual naming scheme, and increment the minor version everywhere. Since we don't need to be compatible with 5.7 we don't need to drag the 5.7 version around at all. In addition, we also don't need to namespace QtScxml in any QML context and, using the additional type information, we can easily constrain the types of all state machiens in QML. The fromFile() and fromData() methods don't have to be Q_INVOKABLE and that just confuses qmlplugindump, do drop Q_INVOKABLE there. Change-Id: I7bd3f10ac458d64fcb98caece770b5d4c61abdb5 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Add a QML default property for QScxmlStateMachineUlf Hermann2016-08-181-1/+1
| | | | | | | | | The extension object will be injected into any state machine constructed from QML. This way child QML objects can be added to a state machine without explicitly declaring properties. Change-Id: If8ec048137cbfb88c3317dee6f626a1cb74248dc Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Auto-include qscxmlc in module configUlf Hermann2016-07-151-2/+0
| | | | | | | | This enables us to drop all the load(qscxmlc) declarations in the various .pro files. Change-Id: I37e0ddba76be1c4c79dea1302634f62a22032ee2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Better connection mechanism for eventsUlf Hermann2016-07-141-3/+4
| | | | | | | | | The connectToEvent() mechanism is analogous to connectToState() and allows arbitrary event specifications, with '.' and '*'. In addition a QML component is provided to make event connections available in QML. Change-Id: Ie45422481a794b1b350347c383318857e5dc3f6d Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Adjust style of calculator exampleUlf Hermann2016-04-062-3/+15
| | | | | | | Change-Id: If3dfab3d0ec1faaa7cbeb5d4da34a24f6da288c7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Diana de Sousa <diana.desousa@theqtcompany.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Doc: Add docs for Calculator QML exampleLeena Miettinen2016-04-012-0/+77
| | | | | | | | | - Use a .qdocinc include file for compilation instructions - Add screenshot - Fix related issues in the widget version docs Change-Id: Ia1de27f81a45e23ab37158cb66b537c95810c28b Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Add calculator QML exampleUlf Hermann2016-03-315-0/+325
Change-Id: I225ace405a9afc62ba68079a53856a2567f678bd Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>