summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/doc/config/qdoc.qdocconf
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-02-24 10:48:32 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-02-24 10:48:32 (GMT)
commite51fda7db531628b54297ae020dda4a5f962d394 (patch)
tree846fa261f80459529235e890ed897cf6186e9351 /tools/qdoc3/doc/config/qdoc.qdocconf
parent66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff)
parentc881e33e7e510204fabd061dac08a00b10b432fb (diff)
downloadQt-e51fda7db531628b54297ae020dda4a5f962d394.zip
Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz
Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/qdoc3/doc/config/qdoc.qdocconf')
-rw-r--r--tools/qdoc3/doc/config/qdoc.qdocconf2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qdoc3/doc/config/qdoc.qdocconf b/tools/qdoc3/doc/config/qdoc.qdocconf
new file mode 100644
index 0000000..c238abe
--- /dev/null
+++ b/tools/qdoc3/doc/config/qdoc.qdocconf
@@ -0,0 +1,2 @@
+include(qdoc-project.qdocconf)
+include(qt-html-templates.qdocconf)