diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-20 08:22:14 (GMT) |
| commit | d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62 (patch) | |
| tree | 462bf65a95e6de5438c728cbf157994e9684cd37 /tools/qdoc3/test/qt-build-docs.qdocconf | |
| parent | eff255bd29a8cbd09494f9e9480c2e4b07869386 (diff) | |
| parent | a948c797e0c45c965ada005b34c274514a3c4d42 (diff) | |
| download | Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.zip Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.gz Qt-d92b8e0fdcbfcad0c98b8c51fe2bd6451868af62.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/toys/dynamicscene/qml/itemCreation.js
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index f0c2535..d3c855f 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -42,6 +42,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 |