diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 19:29:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 19:29:48 (GMT) |
| commit | 52f6bec3c91868b88fc0e2c755ce7ed47dcc89cb (patch) | |
| tree | 5357f6f6da49cc2d0c4bfcb16d3c370e162b1a11 /tools/qdoc3/htmlgenerator.h | |
| parent | 9d17022f9f18a0c1dfc97700f694902934ad0fe7 (diff) | |
| parent | 83e926db90f620d18078ef3d634cf033e88cefa9 (diff) | |
| download | Qt-52f6bec3c91868b88fc0e2c755ce7ed47dcc89cb.zip Qt-52f6bec3c91868b88fc0e2c755ce7ed47dcc89cb.tar.gz Qt-52f6bec3c91868b88fc0e2c755ce7ed47dcc89cb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Update license headers
Silently ignore a wrong parameter count instead of crashing
Introducing --address <bus> parameter to qdbus
Introduce menubar plugin system
Introduce QAbstractPlatformMenuBar
Hide Q<Platform>MenuAction
Fix warning about initialization order
Diffstat (limited to 'tools/qdoc3/htmlgenerator.h')
0 files changed, 0 insertions, 0 deletions