diff options
author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-21 17:15:50 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-22 15:47:01 +0200 |
commit | 75d13b247f851ed9be42330f45967bdfffdba054 (patch) | |
tree | 294e673da3ce92039c55fa5b61d972112c7e5581 | |
parent | ec2ad53d9b1b2abc435b593723441081811aebb4 (diff) |
Use QMAKE_DOCSv5.0.0-beta1
Change-Id: I565956b9e2ae59a0f30ac1672570078beaa708ba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
-rw-r--r-- | doc/doc.pri | 14 | ||||
-rw-r--r-- | qtxmlpatterns.pro | 2 | ||||
-rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/doc/doc.pri b/doc/doc.pri deleted file mode 100644 index 459e9baa..00000000 --- a/doc/doc.pri +++ /dev/null @@ -1,14 +0,0 @@ -OTHER_FILES += \ - $$PWD/qt5.qdocconf \ - $$PWD/qt5-dita.qdocconf - -docs_target.target = docs -docs_target.commands = qdoc3 $$PWD/qt5.qdocconf - -ditadocs_target.target = ditadocs -ditadocs_target.commands = qdoc3 $$PWD/qt5-dita.qdocconf - -QMAKE_EXTRA_TARGETS = docs_target ditadocs_target -QMAKE_CLEAN += \ - "-r $$PWD/html" \ - "-r $$PWD/ditaxml" diff --git a/qtxmlpatterns.pro b/qtxmlpatterns.pro index afc36806..58c33f27 100644 --- a/qtxmlpatterns.pro +++ b/qtxmlpatterns.pro @@ -1,3 +1 @@ load(qt_parts) - -include (doc/doc.pri) diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 1d0a75fc..fa570663 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -9,6 +9,8 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 load(qt_module) +QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf + include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) include($$PWD/api/api.pri) |