diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 00:34:33 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 00:34:33 +1000 |
| commit | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (patch) | |
| tree | ccaeb1246555d2e508e6663ba469ced06f79bb72 /src/opengl/qgl.h | |
| parent | fa976feb9408ebaa12570997471f63683bdb88a2 (diff) | |
| parent | 21711d7ad54b0ee83e776ac3ad83121221fdf24b (diff) | |
| download | qt4-tools-7e4a9187bb11b794e45d95d2e9fae026d6b0d07d.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
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 'src/opengl/qgl.h')
0 files changed, 0 insertions, 0 deletions