summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qmake.qdocconf
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-27 19:32:08 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-27 19:32:08 (GMT)
commite0a2a4d343902e96e51df1fabeaaf543f4cd2a47 (patch)
tree4cb1ab83e9881a403e2857882fb0d6383118a393 /tools/qdoc3/test/qmake.qdocconf
parentf6f9777408691a945c49ef8ec5037d8401c747eb (diff)
parenta17339e943f21bb6c6e16884f716dd9ab8f94938 (diff)
downloadQt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.zip
Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.gz
Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
-rw-r--r--tools/qdoc3/test/qmake.qdocconf41
1 files changed, 40 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index af1b13d..5c7cc29 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,7 +16,46 @@ qhp.qmake.file = qmake.qhp
qhp.qmake.namespace = com.trolltech.qmake.480
qhp.qmake.virtualFolder = qdoc
qhp.qmake.indexTitle = QMake Manual
-qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png
+qhp.qmake.extraFiles = images/api_examples.png \
+ images/api_lookup.png \
+ images/api_topics.png \
+ images/bg_l_blank.png \
+ images/bg_ll_blank.png \
+ images/bg_ll.png \
+ images/bg_l.png \
+ images/bg_lr.png \
+ images/bg_r.png \
+ images/bg_ul_blank.png \
+ images/bg_ul.png \
+ images/bg_ur_blank.png \
+ images/bg_ur.png \
+ images/box_bg.png \
+ images/breadcrumb.png \
+ images/bullet_dn.png \
+ images/bullet_gt.png \
+ images/bullet_sq.png \
+ images/bullet_up.png \
+ images/coloreditorfactoryimage.png \
+ images/content_bg.png \
+ images/dynamiclayouts-example.png \
+ images/feedbackground.png \
+ images/form_bg.png \
+ images/horBar.png \
+ images/page_bg.png \
+ images/print.png \
+ images/qt_guide.png \
+ images/qt_icon.png \
+ images/qt-logo.png \
+ images/qt_ref_doc.png \
+ images/qt_tools.png \
+ images/sep.png \
+ images/sprites-combined.png \
+ images/stylesheet-coffee-plastique.png \
+ images/taskmenuextension-example.png \
+ scripts/functions.js \
+ scripts/jquery.js \
+ style/style.css
+
qhp.qmake.filterAttributes = qt 4.8.0 tools qmake
qhp.qmake.customFilters.qmake.name = qmake Manual
qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake