diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 18:00:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 18:00:17 (GMT) |
| commit | e7989aeb09f7c597edf3498183bd97bd0122382b (patch) | |
| tree | f57f87ba41e19f60e15cb7be8169d1d6148617e1 /tools/qdoc3/test/qt.qdocconf | |
| parent | aa9211937ff38c0fffa55bc879130b33f03865ff (diff) | |
| parent | 20befffe67104368f527bab871fec17c33d58977 (diff) | |
| download | Qt-e7989aeb09f7c597edf3498183bd97bd0122382b.zip Qt-e7989aeb09f7c597edf3498183bd97bd0122382b.tar.gz Qt-e7989aeb09f7c597edf3498183bd97bd0122382b.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (568 commits)
Fixed tst_compilerwarnings test failure due to icecc node failures.
QNAM HTTP: Remove dead code
qmake/MinGw: Link statically.
Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
Compile with Gcc 4.1
Fix a small typo in assistant manual: hompage -> homepage
qmake: added possibility to specify the type of an install target
Print icon in doc pages has no effect.
Assistant has unnecessary repaints when expand/collapse selected node.
Compile fixes.
re-add overriding of tool paths to configure
Optimized pixmapcache key generation for icons and styles
Changelog: Added Designer/uic3 changes for 4.7.0.
Move xmldata example into rssnews demo.
Move Q_ENUMS to start of class declaration
Restructure QDeclarativeAbstractBinding destructor
Don't call pure virtual method in ~QDeclarativeAbstractBinding()
Fix examples autotest when compiled without webkit or xmlpatterns
...
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 7c0ed86..c5cc401 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -26,45 +26,27 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - 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_l.png \ + images/bg_l_blank.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 \ + images/breadcrumb.png \ + images/bullet_gt.png \ + images/bullet_dn.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/feedbackground.png \ + images/horBar.png \ + images/page.png \ + images/page_bg.png \ + images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ + images/taskmenuextension-example.png \ + images/coloreditorfactoryimage.png \ + images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ - style/style.css + style/style.css qhp.Qt.filterAttributes = qt 4.8.0 qtrefdoc qhp.Qt.customFilters.Qt.name = Qt 4.8.0 |