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: (28 commits)
  Optimized QLocale to access system locale on demand.
  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.
  ...

1 files changed, 21 insertions, 0 deletions

diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 441bf39..7705692 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -105,5 +105,26 @@ SOURCES += apigenerator.cpp \
            webxmlgenerator.cpp \
 	   yyindent.cpp
 
+### Documentation for qdoc3 ###
+
+win32:!win32-g++ {
+    unixstyle = false
+} else :win32-g++:isEmpty(QMAKE_SH) {
+    unixstyle = false
+} else {
+    unixstyle = true
+}
+
+$$unixstyle {
+    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3
+} else {
+    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3.exe
+    QDOC = $$replace(QDOC, "/", "\\")
+}
+
+docs.commands = $$QDOC qdoc-manual.qdocconf
+
+QMAKE_EXTRA_TARGETS += docs
+
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target