summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-06-02 15:30:50 +0200
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-06-03 15:47:28 +0300
commit991ea63c6bae70404184b0fcb77aff87bebaa891 (patch)
treee8b9fa908ee10bc1f12e2c441d5c74a546b13e8e /.gitignore
parent944dad62a1f6125583d60b6406c26df7264d7004 (diff)
Added QML module and an example using it.
This supports loading a state machine from a .scxml file, as well as setting a state machine as a QObject on the QML context. Change-Id: Iab2f12cb58f13b43912e83a08e67476d4c9296b5 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 88224a4..7be1abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/tests/3rdparty/scion-tests/node_modules
*~
*.pro.user
+*.qmlproject.user
*.o
Makefile
.qmake.stash
@@ -21,6 +22,9 @@ tests/scion/compiled_tests.h
tests/scion/scxml
tests/scion/scion.h
+examples/trafficlight-qml/statemachine.cpp
+examples/trafficlight-qml/statemachine.h
+examples/trafficlight-qml/Makefile.*
examples/trafficlight-widgets/statemachine.cpp
examples/trafficlight-widgets/statemachine.h
examples/trafficlight-widgets/Makefile.*