summaryrefslogtreecommitdiffstats
path: root/src/tools/uic3/object.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-03 17:11:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-03 17:11:17 (GMT)
commit671eb89e41c90cc4cb11eca1c76181d1186db2b2 (patch)
tree4147f55e1596dc93bb972436130729d657713d24 /src/tools/uic3/object.cpp
parentd5f33087eca066d70240e272d4109c5cca8001cf (diff)
parent18b6067fa99004d1572e3d6b8fbc181729ad96be (diff)
downloadQt-671eb89e41c90cc4cb11eca1c76181d1186db2b2.zip
Qt-671eb89e41c90cc4cb11eca1c76181d1186db2b2.tar.gz
Qt-671eb89e41c90cc4cb11eca1c76181d1186db2b2.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
Diffstat (limited to 'src/tools/uic3/object.cpp')
0 files changed, 0 insertions, 0 deletions