summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-05-19 02:29:09 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-05-19 02:29:09 (GMT)
commit93c1117b7c9d3a0142dc3d48223d27883b61cbef (patch)
tree2ff1d3132cc5304cc9eaa6eeea0cb9c16122fe47 /doc
parent787e9d163dea6b9423c21fbcbe4a7b82f06cb4b3 (diff)
parentdcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff)
downloadQt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.zip
Qt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.tar.gz
Qt-93c1117b7c9d3a0142dc3d48223d27883b61cbef.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 463c447..c6073f0 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -45,11 +45,11 @@ docs.depends = adp_docs qch_docs
# Install rules
htmldocs.files = $$QT_BUILD_TREE/doc/html
htmldocs.path = $$[QT_INSTALL_DOCS]
-htmldocs.CONFIG += no_check_exist
+htmldocs.CONFIG += no_check_exist directory
qchdocs.files= $$QT_BUILD_TREE/doc/qch
qchdocs.path = $$[QT_INSTALL_DOCS]
-qchdocs.CONFIG += no_check_exist
+qchdocs.CONFIG += no_check_exist directory
docimages.files = $$QT_BUILD_TREE/doc/src/images
docimages.path = $$[QT_INSTALL_DOCS]/src