diff options
| author | con <qtc-committer@nokia.com> | 2010-06-18 16:54:37 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-18 16:54:37 +0200 |
| commit | 458a25efa9e4c5f1e10f2bc83302b19d535c7775 (patch) | |
| tree | fe44b77d0e92efd0f2aab7d30a401b51177b55b0 /doc/qtcreator.qdocconf | |
| parent | 443d5d3dc6c77c7bd544cf3523c8a155dcfc05b0 (diff) | |
| parent | 13bb14dd3cc7f468ce8f63f576fb886d94c04c36 (diff) | |
| download | qt-creator-458a25efa9e4c5f1e10f2bc83302b19d535c7775.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qt-html-templates.qdocconf
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
src/plugins/qmljseditor/qmljscodecompletion.cpp
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 3e119c127f..7a083f61ce 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -37,30 +37,23 @@ qhp.QtCreator.extraFiles = \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topics.png \ + images/arrow_down.png \ images/bg_ll.png \ - images/bg_l_blank.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/bg_ll_blank.png \ + images/bg_l_blank.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/box_bg.png \ images/feedbackground.png \ - images/form_bg.png \ images/horBar.png \ images/page_bg.png \ - images/print.png \ - images/qt_guide.png \ images/qt-logo.png \ - images/qt_ref_doc.png \ - images/qt_tools.png \ - images/sep.png \ - images/header.png \ images/sprites-combined.png # macros.qdocconf |