diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
| commit | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (patch) | |
| tree | 9eaf0842a9cd6f719e2d64866b806a84f57f8e1e /doc/doc.pri | |
| parent | 730bfd80804899771b39998c5b67e604d2192ecd (diff) | |
| parent | dcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff) | |
| download | Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.zip Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.gz Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 3d04049..3180a61 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -55,11 +55,11 @@ docs_zh_CN.commands = $$QT_ZH_CN_DOCUMENTATION # 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 |