diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-10 09:11:17 +0200 |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-10 09:11:23 +0200 |
commit | 9456528aac80c6d4c41fa96d88696dc55414b710 (patch) | |
tree | f9fdcc9cd3c7468503590bec7ed082294a0cffde /src/xml | |
parent | 75552c8f62dcfb8012c306b37c79ec629448d780 (diff) | |
parent | ee38dec6f3aff6f7f277323c5c8488d4cd385693 (diff) |
Merge branch 'docs-refactoring' into master
Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/doc/doc.pri | 3 | ||||
-rw-r--r-- | src/xml/xml.pro | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/xml/doc/doc.pri b/src/xml/doc/doc.pri deleted file mode 100644 index d02e45e64e..0000000000 --- a/src/xml/doc/doc.pri +++ /dev/null @@ -1,3 +0,0 @@ -qtPrepareTool(QDOC, qdoc) -docs.commands += $$QDOC $$QT.xml.sources/doc/qtxml.qdocconf -QMAKE_EXTRA_TARGETS += docs diff --git a/src/xml/xml.pro b/src/xml/xml.pro index b8c24496ae..2fff0218e4 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -16,6 +16,9 @@ load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h +QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf +QMAKE_DOCS_INDEX = ../../doc + PRECOMPILED_HEADER = ../corelib/global/qt_pch.h win32-borland { @@ -23,6 +26,5 @@ win32-borland { QMAKE_CXXFLAGS_WARN_ON += -w-use } -include(doc/doc.pri) include(dom/dom.pri) include(sax/sax.pri) |