Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

doc/doc.pri

-# Generate docs. Does not work for shadow builds and never will.
-# (adding a "docs" make target).
-
 unix {
-    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/html $$(QTDIR)/tools/qdoc3/qdoc3
+    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
     HELPGENERATOR = qhelpgenerator
 } else {
     QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
     HELPGENERATOR = qhelpgenerator
 }
 
-QHP_FILE = $$OUT_PWD/html/qtcreator.qhp
-QCH_FILE = $$OUT_PWD/qtcreator.qch
+QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
+QCH_FILE = $$OUT_PWD/doc/qtcreator.qch
 
 html_docs.commands =$$QDOC $$PWD/qtcreator.qdocconf
 html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
@@ -20,6 +17,14 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE
 qch_docs.depends += html_docs
 qch_docs.files = $$QCH_FILE
 
-docs.depends = qch_docs
+macx {
+    cp_docs.commands = $${QMAKE_COPY_DIR} $${OUT_PWD}/doc $${OUT_PWD}/bin/QtCreator.app/Contents/Resources
+    cp_docs.depends += qch_docs
+    docs.depends = cp_docs
+    QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs
+}
+!macx {
+    docs.depends = qch_docs
+    QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
+}
 
-QMAKE_EXTRA_TARGETS += html_docs qch_docs docs

doc/doc.pro

-include(doc.pri)

qtcreator.pro

@@ -2,3 +2,5 @@ TEMPLATE  = subdirs
 CONFIG   += ordered
 
 SUBDIRS = src
+
+include(doc/doc.pri)

src/app/app.pro

@@ -36,13 +36,11 @@ macx {
         SCHEMES.files = $$IDE_SOURCE_TREE/bin/schemes
         GDBDEBUGGER.path = Contents/Resources
         GDBDEBUGGER.files = $$IDE_SOURCE_TREE/bin/gdbmacros
-        DOC.path = Contents/Resources/doc
-        DOC.files = $$IDE_SOURCE_TREE/doc/qtcreator.qch
         LICENSE.path = Contents/Resources
         LICENSE.files = $$IDE_SOURCE_TREE/bin/license.txt
         RUNINTERMINAL.path = Contents/Resources
         RUNINTERMINAL.files = $$IDE_SOURCE_TREE/bin/runInTerminal.command
-        QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER DOC LICENSE RUNINTERMINAL
+        QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
         QMAKE_INFO_PLIST = $$PWD/Info.plist
 }
 !macx {