--- doc/doc.pri.org	2011-12-21 12:41:51.492998171 +0100
+++ doc/doc.pri	2011-12-21 12:43:51.858998156 +0100
@@ -17,11 +17,6 @@
 COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt
 COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html
 
-EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml
-DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml
-EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples
-DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos
-
 $$unixstyle {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
 } else {
@@ -30,18 +25,12 @@
     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
     COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
     COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
-    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\")
-    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\")
-    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\")
-    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
                (cd $$QT_BUILD_TREE && \
                     $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \
-                    $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \
-                    $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \
                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
                     $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
                     $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
@@ -85,14 +74,6 @@
 htmldocs.path = $$[QT_INSTALL_DOCS]
 htmldocs.CONFIG += no_check_exist directory
 
-examplesmanifest.files = $$EXAMPLESMANIFEST
-examplesmanifest.path = $$[QT_INSTALL_EXAMPLES]
-examplesmanifest.CONFIG += no_check_exist directory
-
-demosmanifest.files = $$DEMOSMANIFEST
-demosmanifest.path = $$[QT_INSTALL_DEMOS]
-demosmanifest.CONFIG += no_check_exist directory
-
 qchdocs.files= $$QT_BUILD_TREE/doc/qch
 qchdocs.path = $$[QT_INSTALL_DOCS]
 qchdocs.CONFIG += no_check_exist directory
@@ -104,4 +85,4 @@
 sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE))
 
 QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP
-INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest
+INSTALLS += htmldocs qchdocs docimages