diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 11:31:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 11:31:16 (GMT) |
| commit | e032a0730ad752d0855c281f61799ae89fb36ead (patch) | |
| tree | 502311766e0406aae6bb2d6cee37881174ba0d47 /tools/qdoc3/test/qt.qdocconf | |
| parent | 98a4db7321cb286cd0a7a07adeb265798a650515 (diff) | |
| parent | 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7 (diff) | |
| download | Qt-e032a0730ad752d0855c281f61799ae89fb36ead.zip Qt-e032a0730ad752d0855c281f61799ae89fb36ead.tar.gz Qt-e032a0730ad752d0855c281f61799ae89fb36ead.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page
Doc: updating details on Tier 2 platforms
Doc: adding remark on release of qt quick element support in creator
Doc: updating the qdocconf files and the stylesheet
Replaced QWeakPointer to *Pointer in QGestureManager.
Fixed hiding a window on X11 before it was shown.
Fix incorrect license header.
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index f78bd38..4f0d159 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -50,17 +50,10 @@ qhp.Qt.extraFiles = index.html \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ - scripts/shBrushCpp.js \ - scripts/shCore.js \ - scripts/shLegacy.js \ scripts/narrow.js \ scripts/superfish.js \ - style/shCore.css \ - style/shThemeDefault.css \ style/narrow.css \ style/superfish.css \ - style/superfish_skin.css \ - style/OfflineStyle.css \ style/style_ie6.css \ style/style_ie7.css \ style/style_ie8.css \ |