diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 10:20:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 10:20:01 (GMT) |
| commit | 5e8f97047a31a53a98c8bc71159e00cc56bda94d (patch) | |
| tree | 16dbf550a981392c8147587ab4bd1f6ee59ff05a /doc/src/development/qmake-manual.qdoc | |
| parent | c2016ecdb3e1d493a3fb300193856caaec848e89 (diff) | |
| parent | 7e7be3e5a0441671cdaa9242f6f05871189d0ded (diff) | |
| download | Qt-5e8f97047a31a53a98c8bc71159e00cc56bda94d.zip Qt-5e8f97047a31a53a98c8bc71159e00cc56bda94d.tar.gz Qt-5e8f97047a31a53a98c8bc71159e00cc56bda94d.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Allow 'typeinfo <file>' lines in qmldir.
qmlplugindump: Use command line options with a single dash.
qmlplugindump: Allow dumping by path without URI.
Move qmldump from Qt Creator to Qt.
Diffstat (limited to 'doc/src/development/qmake-manual.qdoc')
0 files changed, 0 insertions, 0 deletions