diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 22:47:13 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 22:47:13 +0100 |
| commit | 68af2fdbb25f8b77a7f314d19d1a0cc50b114e37 (patch) | |
| tree | bf7d6305fa743c73ae7a7f10e9d60ebd01e6d2ae /tools/assistant | |
| parent | 91db91cc7d91f767c2cba340d930b72d69a968b8 (diff) | |
| parent | c5809ade611d93c165dbde8c6ee618da73b0ad48 (diff) | |
| download | qt4-tools-68af2fdbb25f8b77a7f314d19d1a0cc50b114e37.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Memory leak in native Toolbar cleanup in Cocoa
Fix copyright year.
Bump version to 4.6.2.
Add skeleton changes file for 4.6.2.
Add released version of 4.6.1 changes file for posterity.
Designer crashes when previewing QMainWindow with native Toolbar on Mac
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 584c3ceb85..b8726a40e7 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td width=\"30%\" align=\"left\">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ - "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.2</div></td>\n" \ "</tr></table></div></address>" |