diff --git a/doc/doc.pri b/doc/doc.pri index b4c8800f634..c161582f7f8 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -15,10 +15,20 @@ equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp 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.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf +html_docs.depends += $$HELP_DEP_FILES 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.depends += html_docs qch_docs.files = $$QCH_FILE @@ -29,10 +39,10 @@ unix:!macx { INSTALLS += qch_docs } +docs_online.depends = html_docs_online 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 \ - $$PWD/qtcreator.qdocconf -OTHER_FILES += $$PWD/api/qtcreator-api.qdoc \ - $$PWD/api/qtcreator-api.qdocconf +OTHER_FILES = $$HELP_DEP_FILES \ + $$PWD/api/qtcreator-api.qdoc \ + $$PWD/api/qtcreator-api.qdocconf diff --git a/doc/qt-defines.qdocconf b/doc/qt-defines.qdocconf index f3239272c78..67d8e0348ce 100644 --- a/doc/qt-defines.qdocconf +++ b/doc/qt-defines.qdocconf @@ -20,53 +20,46 @@ codeindent = 1 # See also qhp.Qt.extraFiles extraimages.HTML = qt-logo \ trolltech-logo \ - api_examples.png \ - bg_ll.png \ - bg_ul_blank.png \ - bullet_gt.png \ - horBar.png \ - qt_ref_doc.png \ - api_lookup.png \ - bg_ll_blank.png \ - bg_ur.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_r.png \ - box_bg.png \ - feedbackground.png \ - qt_guide.png \ - sprites-combined.png \ - bg_l_blank.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 + api_examples.png \ + api_lookup.png \ + arrow_down.png \ + bg_ll.png \ + bg_l.png \ + bg_lr.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 \ + feedbackground.png \ + horBar.png \ + page_bg.png \ + sprites-combined.png \ + qtcreator-screenshots.png # This stuff is used by the new doc format. scriptdirs = $SRCDIR/templates/scripts styledirs = $SRCDIR/templates/style scripts.HTML = functions.js \ + shBrushCpp.js \ + shCore.js \ + shLegacy.js \ + narrow.js \ + superfish.js \ jquery.js -styles.HTML = OfflineStyle.css \ - style.css \ - style_ie6.css \ - style_ie7.css \ - style_ie8.css +styles.HTML = style.css \ + shCore.css \ + shThemeDefault.css \ + narrow.css \ + superfish.css \ + superfish_skin.css \ + OfflineStyle.css \ + style_ie6.css \ + style_ie7.css \ + style_ie8.css diff --git a/doc/qt-html-templates.qdocconf b/doc/qt-html-templates.qdocconf index edc75f1aa20..0f7ec3e94bc 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -1,8 +1,8 @@ HTML.stylesheets = style/style.css \ - style/OfflineStyle.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style_ie6.css + style/OfflineStyle.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style_ie6.css HTML.postheader = "
\n" \ "
\n" \ @@ -54,12 +54,12 @@ HTML.postheader = "
\n" \ " API Lookup\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ @@ -68,10 +68,10 @@ HTML.postheader = "
\n" \ " Qt Topics\n" \ " \n" \ "
\n" \ @@ -80,11 +80,11 @@ HTML.postheader = "
\n" \ " Examples\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf new file mode 100644 index 00000000000..adfa30760be --- /dev/null +++ b/doc/qtcreator-online.qdocconf @@ -0,0 +1,4 @@ +online = true +# Run qdoc from the directory that contains this file. +include(qtcreator.qdocconf) + diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 02624c66c61..bded10f86a8 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -38,30 +38,23 @@ qhp.QtCreator.extraFiles = \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topics.png \ + images/arrow_down.png \ images/bg_ll.png \ - images/bg_l_blank.png \ images/bg_l.png \ images/bg_lr.png \ images/bg_r.png \ images/bg_ul_blank.png \ - images/bg_ul.png \ - images/bg_ur_blank.png \ - images/bg_ur.png \ + images/bg_ll_blank.png \ + images/bg_l_blank.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/box_bg.png \ images/feedbackground.png \ - images/form_bg.png \ images/horBar.png \ images/page_bg.png \ - images/print.png \ - images/qt_guide.png \ images/qt-logo.png \ - images/qt_ref_doc.png \ - images/qt_tools.png \ - images/sep.png \ - images/header.png \ images/sprites-combined.png # macros.qdocconf diff --git a/doc/templates/images/arrow_down.png b/doc/templates/images/arrow_down.png new file mode 100644 index 00000000000..9d01e97f6a9 Binary files /dev/null and b/doc/templates/images/arrow_down.png differ diff --git a/doc/templates/images/header_bg.png b/doc/templates/images/header_bg.png new file mode 100644 index 00000000000..a436aa61eff Binary files /dev/null and b/doc/templates/images/header_bg.png differ diff --git a/doc/templates/images/page.png b/doc/templates/images/page.png new file mode 100644 index 00000000000..1db151bd31e Binary files /dev/null and b/doc/templates/images/page.png differ diff --git a/doc/templates/images/spinner.gif b/doc/templates/images/spinner.gif new file mode 100644 index 00000000000..1ed786f2ece Binary files /dev/null and b/doc/templates/images/spinner.gif differ diff --git a/doc/templates/style/style.css b/doc/templates/style/style.css index 47fe2e0a04a..28d558f847e 100644 --- a/doc/templates/style/style.css +++ b/doc/templates/style/style.css @@ -678,7 +678,7 @@ padding-left: 3px; background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; height: 20px; - width: 47px; + width: 110px; } .shortCut-topleft-inactive span {