summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-defines.qdocconf
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-04-13 13:38:05 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-04-13 13:38:05 (GMT)
commite00f4f31f996e6c194974e748d5c1505ed188a3b (patch)
treede4e9652178c5949402e9a5e313fb4188df71588 /tools/qdoc3/test/qt-defines.qdocconf
parent68eea9b1006074853a42853f9a34cc4eb1e04b8f (diff)
parentd88dade723d5ddd86eea70ee4bf636c06b9f3962 (diff)
downloadQt-e00f4f31f996e6c194974e748d5c1505ed188a3b.zip
Qt-e00f4f31f996e6c194974e748d5c1505ed188a3b.tar.gz
Qt-e00f4f31f996e6c194974e748d5c1505ed188a3b.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-defines.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-defines.qdocconf4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index e1a008e..06bdaae 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -1,4 +1,4 @@
-defines = Q_QDOC \
+defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \
QT_COMPAT \
@@ -29,6 +29,8 @@ extraimages.HTML = qt-logo \
bg_ll_blank.png \
bg_ur.png \
bullet_sq.png \
+ bullet_dn.png \
+ bullet_up.png \
page_bg.png \
qt_tools.png \
api_topics.png \