summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qmake.qdocconf
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-06-01 17:40:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-06-01 17:40:53 (GMT)
commit5c6e671c8cbab281af4685d3698790ab566ed2f2 (patch)
tree0f3e15d12cf984d8f49c7adfaf056063cc726803 /tools/qdoc3/test/qmake.qdocconf
parent7165826d2e9ff77951a289c62746d6c87f725139 (diff)
parent0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d (diff)
downloadQt-5c6e671c8cbab281af4685d3698790ab566ed2f2.zip
Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.gz
Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
-rw-r--r--tools/qdoc3/test/qmake.qdocconf1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 490faf57..75a3c05 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -30,6 +30,7 @@ qhp.qmake.extraFiles = images/bg_l.png \
images/page.png \
images/page_bg.png \
images/sprites-combined.png \
+ images/spinner.gif \
images/stylesheet-coffee-plastique.png \
images/taskmenuextension-example.png \
images/coloreditorfactoryimage.png \