diff options
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/compat.qdocconf | 4 | ||||
| -rw-r--r-- | doc/config/installerfw-project.qdocconf | 12 | ||||
| -rw-r--r-- | doc/config/macros.qdocconf | 10 | ||||
| -rw-r--r-- | doc/config/qt-html-default-styles.qdocconf | 60 | ||||
| -rw-r--r-- | doc/config/qt-html-online-styles.qdocconf | 96 | ||||
| -rw-r--r-- | doc/config/qt-html-templates-online.qdocconf | 14 | ||||
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 4 |
7 files changed, 125 insertions, 75 deletions
diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf index 5745ed93b..fe793de6b 100644 --- a/doc/config/compat.qdocconf +++ b/doc/config/compat.qdocconf @@ -1,8 +1,8 @@ alias.i = e -alias.include = input +macro.li = "\\o" macro.0 = "\\\\0" -macro.b = "\\\\b" +macro.b = "\\bold" macro.n = "\\\\n" macro.r = "\\\\r" macro.i = "\\o" diff --git a/doc/config/installerfw-project.qdocconf b/doc/config/installerfw-project.qdocconf index 40f8469d9..841414df1 100644 --- a/doc/config/installerfw-project.qdocconf +++ b/doc/config/installerfw-project.qdocconf @@ -1,11 +1,11 @@ -project = "Qt Installer Framework Manual" +project = "Qt Installer Framework" description = "Qt Installer Framework Manual" headerdirs = sourcedirs = $SRCDIR imagedirs = $SRCDIR/images $SRCDIR/templates/images outputdir = $OUTDIR -exampledirs = $SRCDIR +exampledirs = $SRCDIR $SRCDIR/examples indexes = qt.index include(compat.qdocconf) @@ -16,13 +16,13 @@ include(qt-defines.qdocconf) sources.fileextensions = "*.qdoc" qhp.projects = InstallerFramework -qhp.InstallerFramework.file = installerfw.qhp -qhp.InstallerFramework.namespace = com.nokia.qt.installerfw.121 +qhp.InstallerFramework.file = ifw.qhp +qhp.InstallerFramework.namespace = org.qt-project.ifw.121 qhp.InstallerFramework.virtualFolder = doc qhp.InstallerFramework.indexTitle = Qt Installer Framework Manual -qhp.InstallerFramework.filterAttributes = installerfw 121 +qhp.InstallerFramework.filterAttributes = ifw qhp.InstallerFramework.customFilters.InstallerFramework.name = Installer Framework -qhp.InstallerFramework.customFilters.InstallerFramework.filterAttributes = installerfw +qhp.InstallerFramework.customFilters.InstallerFramework.filterAttributes = ifw qhp.InstallerFramework.indexRoot = qhp.InstallerFramework.subprojects = manual diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 568191eec..19960ea50 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -2,17 +2,17 @@ macro.aacute.HTML = "á" macro.Aring.HTML = "Å" macro.aring.HTML = "å" macro.Auml.HTML = "Ä" -macro.author = "\\bold{Author:}" +macro.author = "\\b{Author:}" macro.br.HTML = "<br />" macro.BR.HTML = "<br />" macro.copyright.HTML = "©" macro.eacute.HTML = "é" -macro.gui = "\\bold" +macro.gui = "\\b" macro.hr.HTML = "<hr />" macro.iacute.HTML = "í" -macro.key = "\\bold" -macro.menu = "\\bold" -macro.note = "\\bold{Note:}" +macro.key = "\\b" +macro.menu = "\\b" +macro.note = "\\b{Note:}" macro.oslash.HTML = "ø" macro.ouml.HTML = "ö" macro.QA = "Qt Assistant" diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf index 382d7fe30..1530c158a 100644 --- a/doc/config/qt-html-default-styles.qdocconf +++ b/doc/config/qt-html-default-styles.qdocconf @@ -2,32 +2,52 @@ # specified relative to the template directory and will be copied into # subdirectories of the output directory. -HTML.templatedir = $SRCDIR/templates +HTML.templatedir = $SRCDIR/config -HTML.stylesheets = style/offline.css +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 -extraimages.HTML = qt-logo.png \ - arrow_down.png \ - breadcrumb.png \ - bullet_gt.png \ - bullet_dn.png \ - bullet_sq.png \ - bullet_up.png \ - horBar.png \ - sprites-combined.png \ - bgrContent.png \ - blu_dot.png \ - btn_next.png \ - btn_prev.png \ - ico_note.png \ - ico_note_attention.png \ - ico_out.png \ - arrow_bc.png \ - home.png +# 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/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/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. diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf index a02f10731..56b05dd30 100644 --- a/doc/config/qt-html-online-styles.qdocconf +++ b/doc/config/qt-html-online-styles.qdocconf @@ -2,46 +2,76 @@ # specified relative to the template directory and will be copied into # subdirectories of the output directory. -HTML.templatedir = $SRCDIR/templates +HTML.templatedir = $SRCDIR/config -HTML.stylesheets = style/narrow.css \ - style/style.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/superfish.css +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 = scripts/functions.js \ - scripts/narrow.js \ - scripts/superfish.js \ - scripts/jquery.js +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 -extraimages.HTML = qt-logo.png \ - bg_l.png \ - bg_l_blank.png \ - bg_ll_blank.png \ - bg_ul_blank.png \ - btn_next_green.png \ - btn_prev_green.png \ - header_bg.png \ - bg_r.png \ - box_bg.png \ - breadcrumb.png \ - bullet_gt.png \ - bullet_dn.png \ - bullet_sq.png \ - bullet_up.png \ - arrow_down.png \ - feedbackground.png \ - horBar.png \ - page.png \ - page_bg.png \ - sprites-combined.png \ - spinner.gif +# 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. diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf index 68dd2bea5..edea2655d 100644 --- a/doc/config/qt-html-templates-online.qdocconf +++ b/doc/config/qt-html-templates-online.qdocconf @@ -9,12 +9,11 @@ HTML.postheader = \ " <div id=\"narrowsearch\"></div>\n" \ " <div id=\"nav-topright\">\n" \ " <ul>\n" \ - " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \ - " <li class=\"nav-topright-dev\"><a href=\"http://qt-project.org/\">DEV</a></li>\n" \ - " <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \ + " <li class=\"nav-topright-home\"><a href=\"http://qt.digia.com/\">Qt HOME</a></li>\n" \ + " <li class=\"nav-topright-dev\"><a href=\"http://wiki.qt-project.org/\">DEV</a></li>\n" \ " <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://qt-project.org/doc/\">\n" \ " DOC</a></li>\n" \ - " <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \ + " <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.digia.com/\">BLOG</a></li>\n" \ " </ul>\n" \ " </div>\n" \ " <div id=\"shortCut\">\n" \ @@ -103,7 +102,8 @@ HTML.footer = \ " <span></span>\n" \ " </div>\n" \ " </div> \n" \ - "<div class=\"footer\">\n" \ + " <div class=\"footer\">\n" \ + " <p>\n" \ " <p>\n" \ " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ @@ -122,8 +122,8 @@ HTML.footer = \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - "</div>\n" \ - "\n" \ + " </div>\n" \ + "\n" \ " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ " <script type=\"text/javascript\">\n" \ " var _gaq = _gaq || [];\n" \ diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index 53215b761..2110b688c 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -45,7 +45,7 @@ HTML.footer = \ # Files not referenced in any qdoc file. # See also extraimages.HTML -qhp.QtCreator.extraFiles = index.html \ +qhp.InstallerFramework.extraFiles = index.html \ images/arrow_down.png \ images/breadcrumb.png \ images/bullet_gt.png \ @@ -62,5 +62,5 @@ qhp.QtCreator.extraFiles = index.html \ images/ico_note_attention.png \ images/ico_out.png \ images/home.png \ - images/arrow.png \ + images/arrow_bc.png \ style/offline.css |