diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-25 05:50:23 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-25 05:50:23 (GMT) |
| commit | 410dd39d7294cd0c9e46e01f839c137482d9fc5d (patch) | |
| tree | 0b80cf8aab30e3adcbee39169ce389ad4177ec45 /imports/Qt/widgets/qmldir | |
| parent | d654f87319408e3d9754fa5a8ad376c3eaef4489 (diff) | |
| parent | f29a6c8b9fbeb899997c1e4cc2a4be009a231502 (diff) | |
| download | Qt-410dd39d7294cd0c9e46e01f839c137482d9fc5d.zip Qt-410dd39d7294cd0c9e46e01f839c137482d9fc5d.tar.gz Qt-410dd39d7294cd0c9e46e01f839c137482d9fc5d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qdeclarativemetaproperty.cpp
Diffstat (limited to 'imports/Qt/widgets/qmldir')
| -rw-r--r-- | imports/Qt/widgets/qmldir | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/imports/Qt/widgets/qmldir b/imports/Qt/widgets/qmldir new file mode 100644 index 0000000..6f19878 --- /dev/null +++ b/imports/Qt/widgets/qmldir @@ -0,0 +1 @@ +plugin widgets |