diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 01:15:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 01:15:14 (GMT) |
| commit | 1226fa946170caa7e30ffd1bf64e806a34139978 (patch) | |
| tree | 4b515f0a2e8090ba951383e951f1763933a7fc9c /tools/qdoc3/test/qt.qdocconf | |
| parent | 6d6b7b318a842ef5037065554f30ebfb4ae34d74 (diff) | |
| parent | df9ab6c300eca3a5c75dcee93ae848957cb9a617 (diff) | |
| download | Qt-1226fa946170caa7e30ffd1bf64e806a34139978.zip Qt-1226fa946170caa7e30ffd1bf64e806a34139978.tar.gz Qt-1226fa946170caa7e30ffd1bf64e806a34139978.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:
Only setup ICD test data when ICD is enabled.
Doc: Fixed two diagrams and finally committed images for them.
Make sure cursorPositionChanged is emitted when doing undo/redo
Some more 4.7.0 changes
Fix cosmetic issue in designer filter edits
Doc: Adding support for IE 6, 7 and 8
doc: Updated the widgets tutorial to work without page links.
My 4.7.0 changes
Added support for es_419 locale.
Added Korean and Nynorsk locales support on Symbian.
Gestures in GraphicsView do not require a viewport to subscribe to gestures.
Upgraded QLocale to Unicode CLDR 1.8.1
Removed the "maybe" timer from gesturemanager.
Fixes a crash and a memory leak in gesturemanager.
Embedded changes for 4.7
Added a default value for optimization settings.
Update Polish translations
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 2f6983a..83a35a9 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -46,6 +46,9 @@ qhp.Qt.extraFiles = index.html \ images/dynamiclayouts-example.png \ scripts/functions.js \ scripts/jquery.js \ + style/style_ie6.css \ + style/style_ie7.css \ + style/style_ie8.css \ style/style.css qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc |