forked from qt-creator/qt-creator
Sync doc style with Qt, introduce online version (make docs_online)
The spacing errors come from Qt, and should be fixed there. Reviewed-By: Oswald Buddenhagen
This commit is contained in:
Daniel Molkentin
20
doc/doc.pri
20
doc/doc.pri
@@ -15,10 +15,20 @@ equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
|
|||||||
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
|
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
|
||||||
QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
|
QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
|
||||||
|
|
||||||
|
HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
|
||||||
|
$$PWD/addressbook-sdk.qdoc \
|
||||||
|
$$PWD/qt-defines.qdocconf \
|
||||||
|
$$PWD/qt-html-templates.qdocconf \
|
||||||
|
$$PWD/qtcreator.qdocconf \
|
||||||
|
$$PWD/qtcreator-online.qdocconf
|
||||||
|
|
||||||
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
|
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
|
||||||
html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
|
html_docs.depends += $$HELP_DEP_FILES
|
||||||
html_docs.files = $$QHP_FILE
|
html_docs.files = $$QHP_FILE
|
||||||
|
|
||||||
|
html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
|
||||||
|
html_docs_online.depends += $$HELP_DEP_FILES
|
||||||
|
|
||||||
qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
|
qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
|
||||||
qch_docs.depends += html_docs
|
qch_docs.depends += html_docs
|
||||||
qch_docs.files = $$QCH_FILE
|
qch_docs.files = $$QCH_FILE
|
||||||
@@ -29,10 +39,10 @@ unix:!macx {
|
|||||||
INSTALLS += qch_docs
|
INSTALLS += qch_docs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
docs_online.depends = html_docs_online
|
||||||
docs.depends = qch_docs
|
docs.depends = qch_docs
|
||||||
QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
|
QMAKE_EXTRA_TARGETS += html_docs html_docs_online qch_docs docs docs_online
|
||||||
|
|
||||||
OTHER_FILES = $$PWD/qtcreator.qdoc \
|
OTHER_FILES = $$HELP_DEP_FILES \
|
||||||
$$PWD/qtcreator.qdocconf
|
$$PWD/api/qtcreator-api.qdoc \
|
||||||
OTHER_FILES += $$PWD/api/qtcreator-api.qdoc \
|
|
||||||
$$PWD/api/qtcreator-api.qdocconf
|
$$PWD/api/qtcreator-api.qdocconf
|
||||||
|
|||||||
@@ -21,52 +21,45 @@ codeindent = 1
|
|||||||
extraimages.HTML = qt-logo \
|
extraimages.HTML = qt-logo \
|
||||||
trolltech-logo \
|
trolltech-logo \
|
||||||
api_examples.png \
|
api_examples.png \
|
||||||
bg_ll.png \
|
|
||||||
bg_ul_blank.png \
|
|
||||||
bullet_gt.png \
|
|
||||||
horBar.png \
|
|
||||||
qt_ref_doc.png \
|
|
||||||
api_lookup.png \
|
api_lookup.png \
|
||||||
bg_ll_blank.png \
|
arrow_down.png \
|
||||||
bg_ur.png \
|
bg_ll.png \
|
||||||
bullet_sq.png \
|
|
||||||
bullet_dn.png \
|
|
||||||
bullet_up.png \
|
|
||||||
page_bg.png \
|
|
||||||
qt_tools.png \
|
|
||||||
api_topics.png \
|
|
||||||
bg_lr.png \
|
|
||||||
bg_ur_blank.png \
|
|
||||||
content_bg.png \
|
|
||||||
print.png \
|
|
||||||
sep.png \
|
|
||||||
bg_l.png \
|
bg_l.png \
|
||||||
|
bg_lr.png \
|
||||||
bg_r.png \
|
bg_r.png \
|
||||||
|
bg_ul_blank.png \
|
||||||
|
bg_ll_blank.png \
|
||||||
|
bg_l_blank.png \
|
||||||
|
breadcrumb.png \
|
||||||
|
bullet_dn.png \
|
||||||
|
bullet_gt.png \
|
||||||
|
bullet_sq.png \
|
||||||
box_bg.png \
|
box_bg.png \
|
||||||
feedbackground.png \
|
feedbackground.png \
|
||||||
qt_guide.png \
|
horBar.png \
|
||||||
|
page_bg.png \
|
||||||
sprites-combined.png \
|
sprites-combined.png \
|
||||||
bg_l_blank.png \
|
qtcreator-screenshots.png
|
||||||
bg_ul.png \
|
|
||||||
breadcrumb.png \
|
|
||||||
form_bg.png \
|
|
||||||
qt_icon.png \
|
|
||||||
header.png \
|
|
||||||
qtcreator-screenshots.png \
|
|
||||||
taskmenuextension-example.png \
|
|
||||||
coloreditorfactoryimage.png \
|
|
||||||
dynamiclayouts-example.png \
|
|
||||||
stylesheet-coffee-plastique.png
|
|
||||||
|
|
||||||
# This stuff is used by the new doc format.
|
# This stuff is used by the new doc format.
|
||||||
scriptdirs = $SRCDIR/templates/scripts
|
scriptdirs = $SRCDIR/templates/scripts
|
||||||
styledirs = $SRCDIR/templates/style
|
styledirs = $SRCDIR/templates/style
|
||||||
|
|
||||||
scripts.HTML = functions.js \
|
scripts.HTML = functions.js \
|
||||||
|
shBrushCpp.js \
|
||||||
|
shCore.js \
|
||||||
|
shLegacy.js \
|
||||||
|
narrow.js \
|
||||||
|
superfish.js \
|
||||||
jquery.js
|
jquery.js
|
||||||
|
|
||||||
styles.HTML = OfflineStyle.css \
|
styles.HTML = style.css \
|
||||||
style.css \
|
shCore.css \
|
||||||
|
shThemeDefault.css \
|
||||||
|
narrow.css \
|
||||||
|
superfish.css \
|
||||||
|
superfish_skin.css \
|
||||||
|
OfflineStyle.css \
|
||||||
style_ie6.css \
|
style_ie6.css \
|
||||||
style_ie7.css \
|
style_ie7.css \
|
||||||
style_ie8.css
|
style_ie8.css
|
||||||
|
|||||||
@@ -54,12 +54,12 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
|
|||||||
" API Lookup</h2>\n" \
|
" API Lookup</h2>\n" \
|
||||||
" <div id=\"list001\" class=\"list\">\n" \
|
" <div id=\"list001\" class=\"list\">\n" \
|
||||||
" <ul id=\"ul001\" >\n" \
|
" <ul id=\"ul001\" >\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/classes.html\">Class index</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/functions.html\">Function index</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/modules.html\">Modules</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/namespaces.html\">Namespaces</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtglobal.html\">Global stuff</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeelements.html\">QML elements</a></li>\n" \
|
||||||
" </ul> \n" \
|
" </ul> \n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
@@ -68,10 +68,10 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
|
|||||||
" Qt Topics</h2>\n" \
|
" Qt Topics</h2>\n" \
|
||||||
" <div id=\"list002\" class=\"list\">\n" \
|
" <div id=\"list002\" class=\"list\">\n" \
|
||||||
" <ul id=\"ul002\" >\n" \
|
" <ul id=\"ul002\" >\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's & Qt Quick</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/declarativeui.html\">Device UI's & Qt Quick</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/platform-specific.html\">Platform-specific info</a></li>\n" \
|
||||||
" </ul> \n" \
|
" </ul> \n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
@@ -80,11 +80,11 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
|
|||||||
" Examples</h2>\n" \
|
" Examples</h2>\n" \
|
||||||
" <div id=\"list003\" class=\"list\">\n" \
|
" <div id=\"list003\" class=\"list\">\n" \
|
||||||
" <ul id=\"ul003\">\n" \
|
" <ul id=\"ul003\">\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/all-examples.html\">Examples</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/tutorials.html\">Tutorials</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/demos.html\">Demos</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html\">QML Examples</a></li>\n" \
|
||||||
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
|
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
|
||||||
" </ul> \n" \
|
" </ul> \n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
" </div>\n" \
|
" </div>\n" \
|
||||||
|
|||||||
4
doc/qtcreator-online.qdocconf
Normal file
4
doc/qtcreator-online.qdocconf
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
online = true
|
||||||
|
# Run qdoc from the directory that contains this file.
|
||||||
|
include(qtcreator.qdocconf)
|
||||||
|
|
||||||
@@ -38,30 +38,23 @@ qhp.QtCreator.extraFiles = \
|
|||||||
scripts/jquery.js \
|
scripts/jquery.js \
|
||||||
images/api_examples.png \
|
images/api_examples.png \
|
||||||
images/api_lookup.png \
|
images/api_lookup.png \
|
||||||
images/api_topics.png \
|
images/arrow_down.png \
|
||||||
images/bg_ll.png \
|
images/bg_ll.png \
|
||||||
images/bg_l_blank.png \
|
|
||||||
images/bg_l.png \
|
images/bg_l.png \
|
||||||
images/bg_lr.png \
|
images/bg_lr.png \
|
||||||
images/bg_r.png \
|
images/bg_r.png \
|
||||||
images/bg_ul_blank.png \
|
images/bg_ul_blank.png \
|
||||||
images/bg_ul.png \
|
images/bg_ll_blank.png \
|
||||||
images/bg_ur_blank.png \
|
images/bg_l_blank.png \
|
||||||
images/bg_ur.png \
|
|
||||||
images/breadcrumb.png \
|
images/breadcrumb.png \
|
||||||
images/bullet_dn.png \
|
images/bullet_dn.png \
|
||||||
images/bullet_gt.png \
|
images/bullet_gt.png \
|
||||||
|
images/bullet_sq.png \
|
||||||
|
images/box_bg.png \
|
||||||
images/feedbackground.png \
|
images/feedbackground.png \
|
||||||
images/form_bg.png \
|
|
||||||
images/horBar.png \
|
images/horBar.png \
|
||||||
images/page_bg.png \
|
images/page_bg.png \
|
||||||
images/print.png \
|
|
||||||
images/qt_guide.png \
|
|
||||||
images/qt-logo.png \
|
images/qt-logo.png \
|
||||||
images/qt_ref_doc.png \
|
|
||||||
images/qt_tools.png \
|
|
||||||
images/sep.png \
|
|
||||||
images/header.png \
|
|
||||||
images/sprites-combined.png
|
images/sprites-combined.png
|
||||||
|
|
||||||
# macros.qdocconf
|
# macros.qdocconf
|
||||||
|
|||||||
BIN
doc/templates/images/arrow_down.png
vendored
Normal file
BIN
doc/templates/images/arrow_down.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 177 B |
BIN
doc/templates/images/header_bg.png
vendored
Normal file
BIN
doc/templates/images/header_bg.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 114 B |
BIN
doc/templates/images/page.png
vendored
Normal file
BIN
doc/templates/images/page.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
BIN
doc/templates/images/spinner.gif
vendored
Normal file
BIN
doc/templates/images/spinner.gif
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
2
doc/templates/style/style.css
vendored
2
doc/templates/style/style.css
vendored
@@ -678,7 +678,7 @@
|
|||||||
padding-left: 3px;
|
padding-left: 3px;
|
||||||
background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
|
background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
width: 47px;
|
width: 110px;
|
||||||
}
|
}
|
||||||
.shortCut-topleft-inactive span
|
.shortCut-topleft-inactive span
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user