Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  Fix QRegion under Mac OS X.
  update according to Thiago's comments.
  Changes: add functionality for dbus auto start to qt
  Add license header to this file
  readdir64 is not available on HP-UX
  Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
  qdoc3:	Completed handling of the new \pagekeywords command.
  Wrong cursor shown by the parent window after setOverrideCursor().
  Fixed Mac OS X compile time error by using GLint for temp.
  qdoc3:	Added curly braces in switch statement for braindead compiler.
  qdoc: Added a build rule for the documentation - disabled by default.
  Doc: Added the qdoc manual to the repository for future maintenance.
  qdoc3:	Fixed bug in creation of qt.pageindex.
  qdoc3:	Added capability to create qt.pageindex.
  Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
  Cocoa: Implement our own NSApplication subclass
  Cocoa: Menu in menubar stays highlighted
  qdoc: Made a temporary fix for comment highlighting.
  Doc: Tidied up the class layout and removed an unnecessary image.
  Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
  ...

1 files changed, 49 insertions, 0 deletions

diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
new file mode 100644
index 0000000..26fd09c
--- /dev/null
+++ b/tools/qdoc3/doc/qdoc-manual.qdocconf
@@ -0,0 +1,49 @@
+project          = QDoc
+description      = QDoc3 Manual
+
+indexes          = $QTDIR/doc/html/qt.index
+
+outputdir        = html
+
+sources          = qdoc-manual.qdoc
+sourcedirs       = $PWD
+
+exampledirs     += $PWD \
+                   $QTDIR/examples
+
+imagedirs       += images
+
+extraimages.HTML = qt-logo
+
+HTML.stylesheets = classic.css
+
+HTML.style       = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }\n" \
+                   "a:link { color: #004faf; text-decoration: none }\n" \
+                   "a:visited { color: #672967; text-decoration: none }\n" \
+                   "td.postheader { font-family: sans-serif }\n" \
+                   "tr.address { font-family: sans-serif }\n" \
+                   "body { background: #ffffff; color: black; }"
+
+HTML.postheader  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"5\" width=\"100%\">\n" \
+                   "<tr>\n" \
+                   "<td align=\"left\" valign=\"top\" width=\"32\">" \
+                   "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
+                   "</td>\n" \
+                   "<td class=\"postheader\" valign=\"center\">" \
+                   "<a href=\"01-qdoc-manual.html\">" \
+                   "<font color=\"#004faf\">Home: QDoc Manual</font></a>&nbsp;&middot;" \
+                   "<a href=\"http://qt.nokia.com/doc/4.7\">" \
+                   "<font color=\"#004faf\"> Qt Reference Documentation</font></a>" \
+                   "</td>\n" \
+                   "</tr></table>"
+
+HTML.footer     = "<p /><address><hr /><div align=\"center\">\n" \
+                  "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
+                  "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                  "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
+                  "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
+                  "</tr></table></div></address>"
+
+spurious        += "Missing '\\}'" 
+spurious        += "Cannot use .*"
+spurious        += "Unexpected .*"