diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-08-23 16:00:24 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-08-23 16:00:24 +0200 |
| commit | ef1e52dfd1008549a80e0e326ea339dac195ec8a (patch) | |
| tree | 7097926dac3ce8b9dccccdcc6a9e018a67e89e67 /doc/qtcreator.qdocconf | |
| parent | 537404d9814e6b20319402dd5289a702656763b8 (diff) | |
| parent | b7af9e06f85e0fa27ed422e00e1a9b03a2348ced (diff) | |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/gdbmacros/dumper.py
share/qtcreator/gdbmacros/gdbmacros.py
src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/gdb/attachgdbadapter.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/watchhandler.cpp
src/plugins/mercurial/mercurialjobrunner.h
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.pro
src/plugins/qmljseditor/qmljseditorplugin.cpp
src/plugins/qmljseditor/qmljseditorplugin.h
src/plugins/qmljseditor/qmljspreviewrunner.cpp
src/plugins/qmljseditor/qmljspreviewrunner.h
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
src/plugins/qt4projectmanager/qt4projectmanager.pro
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.h
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 360be06b6e0..3b515f4dfd8 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -14,7 +14,7 @@ indexes = qt.index include(qt-defines.qdocconf) -sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc" +sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc" qhp.projects = QtCreator @@ -31,10 +31,17 @@ qhp.QtCreator.extraFiles = \ style/style_ie6.css \ style/style_ie7.css \ style/style_ie8.css \ + style/OfflineStyle.css \ + style/narrow.css \ + style/OfflineStyle.css \ + style/superfish.css \ + style/superfish_skin.css \ images/qt-logo.png \ images/qtcreator-screenshots.png \ scripts/functions.js \ scripts/jquery.js \ + scripts/narrow.js \ + scripts/superfish.js \ images/api_examples.png \ images/api_lookup.png \ images/arrow_down.png \ |