diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-07 00:51:34 (GMT) |
| commit | 5b67b61150771cf978648a35db201345d6fb37ae (patch) | |
| tree | c8927dd65b3d1edeff76fd21ac0c49b7ace72bf6 /doc/src/snippets/declarative/focus/qmldir | |
| parent | c527a1ee371c4758776217e7d16c75e20fe6f5aa (diff) | |
| parent | 9cc21c043238dc7576a465c9d236e8968fd8c549 (diff) | |
| download | Qt-5b67b61150771cf978648a35db201345d6fb37ae.zip Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.gz Qt-5b67b61150771cf978648a35db201345d6fb37ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
Diffstat (limited to 'doc/src/snippets/declarative/focus/qmldir')
| -rw-r--r-- | doc/src/snippets/declarative/focus/qmldir | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/snippets/declarative/focus/qmldir b/doc/src/snippets/declarative/focus/qmldir new file mode 100644 index 0000000..d0683b2 --- /dev/null +++ b/doc/src/snippets/declarative/focus/qmldir @@ -0,0 +1,4 @@ +MyWidget 1.0 mywidget.qml +MyFocusScopeWidget 1.0 myfocusscopewidget.qml +MyClickableWidget 1.0 myclickablewidget.qml + |