From 0d9b2548400897a4c64d5955d51fa6a244f01701 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 21 Nov 2014 12:26:44 +0100 Subject: Doc: remove support for building docs with Qt 4 The templates are fetched from qtbase/doc/global Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eike Ziller Reviewed-by: Jerome Pasion --- doc/config/compat.qdocconf | 31 ------ doc/config/qt-html-default-styles.qdocconf | 63 ----------- doc/config/qt-html-online-styles.qdocconf | 104 ----------------- doc/config/qt-html-templates-online.qdocconf | 161 --------------------------- doc/config/qt-html-templates.qdocconf | 67 ----------- doc/config/qtcreator-developer.qdocconf | 19 +++- 6 files changed, 18 insertions(+), 427 deletions(-) delete mode 100644 doc/config/compat.qdocconf delete mode 100644 doc/config/qt-html-default-styles.qdocconf delete mode 100644 doc/config/qt-html-online-styles.qdocconf delete mode 100644 doc/config/qt-html-templates-online.qdocconf delete mode 100644 doc/config/qt-html-templates.qdocconf (limited to 'doc/config') diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf deleted file mode 100644 index fe793de6b8..0000000000 --- a/doc/config/compat.qdocconf +++ /dev/null @@ -1,31 +0,0 @@ -alias.i = e - -macro.li = "\\o" -macro.0 = "\\\\0" -macro.b = "\\bold" -macro.n = "\\\\n" -macro.r = "\\\\r" -macro.i = "\\o" -macro.i11 = "\\o{1,1}" -macro.i12 = "\\o{1,2}" -macro.i13 = "\\o{1,3}" -macro.i14 = "\\o{1,4}" -macro.i15 = "\\o{1,5}" -macro.i16 = "\\o{1,6}" -macro.i17 = "\\o{1,7}" -macro.i18 = "\\o{1,8}" -macro.i19 = "\\o{1,9}" -macro.i21 = "\\o{2,1}" -macro.i31 = "\\o{3,1}" -macro.i41 = "\\o{4,1}" -macro.i51 = "\\o{5,1}" -macro.i61 = "\\o{6,1}" -macro.i71 = "\\o{7,1}" -macro.i81 = "\\o{8,1}" -macro.i91 = "\\o{9,1}" -macro.img = "\\image" -macro.endquote = "\\endquotation" -macro.relatesto = "\\relates" - -spurious = "Missing comma in .*" \ - "Missing pattern .*" diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf deleted file mode 100644 index 63ab33121a..0000000000 --- a/doc/config/qt-html-default-styles.qdocconf +++ /dev/null @@ -1,63 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = $SRCDIR/config - -HTML.stylesheets = ../templates/style/offline.css - -HTML.scripts = - -# Files not referenced in any qdoc file (last four needed by qtdemo) -# See also qhp.Qt.extraFiles -# for Qt 4: -extraimages.HTML = ../templates/images/qt-logo.png \ - ../templates/images/arrow_down.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/horBar.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/qtcreator-screenshots.png \ - ../templates/images/bgrContent.png \ - ../templates/images/blu_dot.png \ - ../templates/images/btn_next.png \ - ../templates/images/btn_prev.png \ - ../templates/images/ico_note.png \ - ../templates/images/ico_note_attention.png \ - ../templates/images/ico_out.png \ - ../templates/images/arrow_bc.png \ - ../templates/images/home.png -# for Qt 5 -HTML.extraimages = ../templates/images/qt-logo.png \ - ../templates/images/arrow_down.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/horBar.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/qtcreator-screenshots.png \ - ../templates/images/bgrContent.png \ - ../templates/images/blu_dot.png \ - ../templates/images/btn_next.png \ - ../templates/images/btn_prev.png \ - ../templates/images/ico_note.png \ - ../templates/images/ico_note_attention.png \ - ../templates/images/ico_out.png \ - ../templates/images/arrow_bc.png \ - ../templates/images/home.png - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " \n" - -HTML.headerscripts = - -HTML.endheader = \ - "\n" \ - "\n" diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf deleted file mode 100644 index 56b05dd30a..0000000000 --- a/doc/config/qt-html-online-styles.qdocconf +++ /dev/null @@ -1,104 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = $SRCDIR/config - -HTML.stylesheets = ../templates/style/narrow.css \ - ../templates/style/style.css \ - ../templates/style/style_ie6.css \ - ../templates/style/style_ie7.css \ - ../templates/style/style_ie8.css \ - ../templates/style/superfish.css - -# Adding jquery and functions - providing online tools and search features -HTML.scripts = ../templates/scripts/functions.js \ - ../templates/scripts/narrow.js \ - ../templates/scripts/superfish.js \ - ../templates/scripts/jquery.js - - -# Files not referenced in any qdoc file. -# See also qhp.Qt.extraFiles -# for Qt 4 -extraimages.HTML = ../templates/images/qt-logo.png \ - ../templates/images/bg_l.png \ - ../templates/images/bg_l_blank.png \ - ../templates/images/bg_ll_blank.png \ - ../templates/images/bg_ul_blank.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/header_bg.png \ - ../templates/images/bg_r.png \ - ../templates/images/box_bg.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/arrow_down.png \ - ../templates/images/feedbackground.png \ - ../templates/images/horBar.png \ - ../templates/images/page.png \ - ../templates/images/page_bg.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/spinner.gif \ - ../templates/images/qtcreator-screenshots.png -# for Qt 5 -HTML.extraimages = ../templates/images/qt-logo.png \ - ../templates/images/bg_l.png \ - ../templates/images/bg_l_blank.png \ - ../templates/images/bg_ll_blank.png \ - ../templates/images/bg_ul_blank.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/header_bg.png \ - ../templates/images/bg_r.png \ - ../templates/images/box_bg.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/arrow_down.png \ - ../templates/images/feedbackground.png \ - ../templates/images/horBar.png \ - ../templates/images/page.png \ - ../templates/images/page_bg.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/spinner.gif \ - ../templates/images/qtcreator-screenshots.png - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - "\n" \ - "\n" \ - "\n\n" - -HTML.headerscripts = \ - "\n" \ - "\n\n" - -HTML.endheader = \ - "\n" \ - "\n" diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf deleted file mode 100644 index c5dc66dff1..0000000000 --- a/doc/config/qt-html-templates-online.qdocconf +++ /dev/null @@ -1,161 +0,0 @@ -include(qt-html-online-styles.qdocconf) - -HTML.postheader = \ - "
\n" \ - "
\n" \ - "
\n" \ - " Home
\n" \ - " Qt Creator Manual\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " API Lookup

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " Qt Topics

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " Examples

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
    \n" \ - "
  • Home
    • \n" \ - " \n" - -HTML.postpostheader = \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" - -HTML.footer = \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.

\n" \ - "
\n" \ - "

\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " GNU Free Documentation\n" \ - " License version 1.3 as published by the Free Software Foundation.

\n" \ - "

\n" \ - " Documentation sources may be obtained from \n" \ - " www.qt-project.org.

\n" \ - "
\n" \ - "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. Privacy Policy

\n" \ - "
\n" \ - "\n" - - -# Files not referenced in any qdoc file. -# See also extraimages.HTML -qhp.QtCreator.extraFiles = index.html \ - images/bg_l.png \ - images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ul_blank.png \ - images/header_bg.png \ - images/bg_r.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/arrow_down.png \ - images/feedbackground.png \ - images/horBar.png \ - images/page.png \ - images/page_bg.png \ - images/sprites-combined.png \ - images/spinner.gif \ - images/qtcreator-screenshots.png \ - scripts/functions.js \ - scripts/jquery.js \ - scripts/narrow.js \ - scripts/superfish.js \ - style/narrow.css \ - style/superfish.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style.css diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf deleted file mode 100644 index 95507fefc5..0000000000 --- a/doc/config/qt-html-templates.qdocconf +++ /dev/null @@ -1,67 +0,0 @@ -include(qt-html-default-styles.qdocconf) - -HTML.postheader = \ - "
\n" \ - "
\n" \ - " Qt Creator Documentation $QTC_VERSION\n" \ - "
\n" \ - "
\n" \ - "
    \n" \ - "
  • Home
    • \n" \ - " \n" - -HTML.postpostheader = \ - "\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" - -HTML.footer = \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.

\n" \ - "
\n" \ - "

\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " GNU Free Documentation\n" \ - " License version 1.3 as published by the Free Software Foundation.

\n" \ - "

\n" \ - " Documentation sources may be obtained from \n" \ - " www.qt-project.org.

\n" \ - "
\n" \ - "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. Privacy Policy

\n" \ - "
\n" \ - -# Files not referenced in any qdoc file. -# See also extraimages.HTML -qhp.QtCreator.extraFiles = index.html \ - images/arrow_down.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/horBar.png \ - images/sprites-combined.png \ - images/qtcreator-screenshots.png \ - images/bgrContent.png \ - images/blu_dot.png \ - images/btn_next.png \ - images/btn_prev.png \ - images/ico_note.png \ - images/ico_note_attention.png \ - images/ico_out.png \ - images/home.png \ - images/arrow_bc.png \ - style/offline.css diff --git a/doc/config/qtcreator-developer.qdocconf b/doc/config/qtcreator-developer.qdocconf index ef04d0b29f..14e7d28c04 100644 --- a/doc/config/qtcreator-developer.qdocconf +++ b/doc/config/qtcreator-developer.qdocconf @@ -43,7 +43,24 @@ sources.fileextensions = "*.cpp *.qdoc" imagedirs = $SRCDIR/api/images $SRCDIR/images $SRCDIR/templates/images outputdir = $OUTDIR exampledirs = $SRCDIR/api/examples -indexes = qt.index + +indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \ + $QDOC_INDEX_DIR/qtcore/qtcore.index \ + $QDOC_INDEX_DIR/qtqml/qtqml.index \ + $QDOC_INDEX_DIR/qtquick/qtquick.index \ + $QDOC_INDEX_DIR/qmake/qmake.index \ + $QDOC_INDEX_DIR/qtdesigner/qtdesigner.index \ + $QDOC_INDEX_DIR/qtdoc/qtdoc.index \ + $QDOC_INDEX_DIR/qtgui/qtgui.index \ + $QDOC_INDEX_DIR/qthelp/qthelp.index \ + $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \ + $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \ + $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \ + $QDOC_INDEX_DIR/qtscript/qtscript.index \ + $QDOC_INDEX_DIR/qtsensors/qtsensors.index \ + $QDOC_INDEX_DIR/qtuitools/qtuitools.index \ + $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \ + $QDOC_INDEX_DIR/qtxml/qtxml.index include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) -- cgit v1.2.3