summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/javadocgenerator.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-06 15:51:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-06 15:51:49 (GMT)
commit69bc7ba41375e3f00b2111bda8d2743654960f71 (patch)
tree0c1e9b573ba6eaee4ec8686937ad12307f40dc51 /tools/qdoc3/javadocgenerator.h
parentd63accf173ed58c7746ecd1e3a40ecac263f186f (diff)
parent522660346023c025d14bfa029f70c88d18eb609d (diff)
downloadQt-69bc7ba41375e3f00b2111bda8d2743654960f71.zip
Qt-69bc7ba41375e3f00b2111bda8d2743654960f71.tar.gz
Qt-69bc7ba41375e3f00b2111bda8d2743654960f71.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup Changelog: Added Designer/uic entries for 4.6.1 Designer: Enable seconds editing for Q[Date]TimeEdit's properties. Designer: Selection handles disappear when using style sheet on form. do not accumulate messages
Diffstat (limited to 'tools/qdoc3/javadocgenerator.h')
0 files changed, 0 insertions, 0 deletions