summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2014-03-18 14:12:28 +0100
committerTopi Reiniƶ <topi.reinio@digia.com>2014-03-18 16:23:02 +0200
commit2caaeabdc62eefba037619e2c5b3bab57369c347 (patch)
treef97b330493305ea529587484e3ef73f9c9f6191b /doc
parent818bc14e588f98609dd82f34b47b487a40847890 (diff)
Doc: Switch to use the global Qt template for example docs
Switch to use the global Qt documentation template, remove local copy of the template, and clean up the documentation configuration. Task-number: QTEE-392 Change-Id: Ib026725696aa1302572558f73ea89f683867939c Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/b2qt-demos.qdocconf17
-rw-r--r--doc/html-offline.qdocconf35
-rw-r--r--doc/template/images/arrow_bc.pngbin1071 -> 0 bytes
-rw-r--r--doc/template/images/bgrContent.pngbin149 -> 0 bytes
-rw-r--r--doc/template/images/blu_dot.pngbin168 -> 0 bytes
-rw-r--r--doc/template/images/btn_next.pngbin689 -> 0 bytes
-rw-r--r--doc/template/images/btn_prev.pngbin676 -> 0 bytes
-rw-r--r--doc/template/images/home.pngbin1076 -> 0 bytes
-rw-r--r--doc/template/images/ico_note.pngbin649 -> 0 bytes
-rw-r--r--doc/template/images/ico_note_attention.pngbin529 -> 0 bytes
-rw-r--r--doc/template/images/ico_out.pngbin362 -> 0 bytes
-rw-r--r--doc/template/style/offline.css628
12 files changed, 8 insertions, 672 deletions
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index d1dec94..d01a251 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -27,18 +27,11 @@ qhp.QtEnterpriseEmbeddedDemos.virtualFolder = b2qt-demos
qhp.QtEnterpriseEmbeddedDemos.indexTitle = Qt Enterprise Embedded Examples and Demos
qhp.QtEnterpriseEmbeddedDemos.indexRoot =
-qhp.QtEnterpriseEmbeddedDemos.subprojects = demos
-qhp.QtEnterpriseEmbeddedDemos.subprojects.demos.title = Qt Enterprise Embedded Examples and Demos
-qhp.QtEnterpriseEmbeddedDemos.subprojects.demos.indexTitle = Qt Enterprise Embedded Examples and Demos
-
-manifestmeta.filters = thumbnail
-#manifestmeta.thumbnail.attributes = "imageUrl:qthelp\://com.digia.b2qt-demos.200/b2qt-demos/images/b2qt-demo.png"
-manifestmeta.thumbnail.tags = "b2qt,qtee"
-manifestmeta.thumbnail.names = "QtEnterpriseEmbeddedDemos/*"
-
-# Add an image used in example manifests to qhp
-HTML.extraimages += images/b2qt-demo.png
-qhp.QtEnterpriseEmbeddedDemos.extraFiles += images/b2qt-demo.png
+qhp.QtEnterpriseEmbeddedDemos.subprojects = demos
+
+manifestmeta.filters = b2qt
+manifestmeta.b2qt.tags = "b2qt,qtee"
+manifestmeta.b2qt.names = "QtEnterpriseEmbeddedDemos/*"
macro.B2Q = "Boot to Qt"
macro.SDK = "Qt Enterprise Embedded"
diff --git a/doc/html-offline.qdocconf b/doc/html-offline.qdocconf
index bef6912..1488996 100644
--- a/doc/html-offline.qdocconf
+++ b/doc/html-offline.qdocconf
@@ -1,36 +1,7 @@
-HTML.nobreadcrumbs = "true"
-
-HTML.stylesheets = template/style/offline.css
-
-# Copy images used by the template to images folder in output directory
-HTML.extraimages = template/images/bgrContent.png \
- template/images/blu_dot.png \
- template/images/btn_next.png \
- template/images/btn_prev.png \
- template/images/ico_note.png \
- template/images/ico_note_attention.png \
- template/images/ico_out.png \
- template/images/arrow_bc.png \
- template/images/home.png
+# use the global Qt template with modifications to the html footer
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
-# Add style-related files into qch package
-qhp.extraFiles += style/offline.css \
- 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
-
-HTML.headerstyles = \
- " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
-
-HTML.endheader = \
- "</head>\n" \
- "<body>\n"
+HTML.nobreadcrumbs = "true"
HTML.footer = \
" <div class=\"ft\">\n" \
diff --git a/doc/template/images/arrow_bc.png b/doc/template/images/arrow_bc.png
deleted file mode 100644
index f2a83a5..0000000
--- a/doc/template/images/arrow_bc.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/bgrContent.png b/doc/template/images/bgrContent.png
deleted file mode 100644
index 1a81b03..0000000
--- a/doc/template/images/bgrContent.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/blu_dot.png b/doc/template/images/blu_dot.png
deleted file mode 100644
index c332148..0000000
--- a/doc/template/images/blu_dot.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/btn_next.png b/doc/template/images/btn_next.png
deleted file mode 100644
index f7bc2b7..0000000
--- a/doc/template/images/btn_next.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/btn_prev.png b/doc/template/images/btn_prev.png
deleted file mode 100644
index 10a620c..0000000
--- a/doc/template/images/btn_prev.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/home.png b/doc/template/images/home.png
deleted file mode 100644
index 8de6d0c..0000000
--- a/doc/template/images/home.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/ico_note.png b/doc/template/images/ico_note.png
deleted file mode 100644
index 1379404..0000000
--- a/doc/template/images/ico_note.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/ico_note_attention.png b/doc/template/images/ico_note_attention.png
deleted file mode 100644
index b85b696..0000000
--- a/doc/template/images/ico_note_attention.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/images/ico_out.png b/doc/template/images/ico_out.png
deleted file mode 100644
index ff6e458..0000000
--- a/doc/template/images/ico_out.png
+++ /dev/null
Binary files differ
diff --git a/doc/template/style/offline.css b/doc/template/style/offline.css
deleted file mode 100644
index 3bab27b..0000000
--- a/doc/template/style/offline.css
+++ /dev/null
@@ -1,628 +0,0 @@
-body{
-font: normal 400 14px/1.2 Arial;
-margin-top:85px;
-font-family: Arial, Helvetica;
-color:#313131;
-text-align:justify;
-margin-left:5px;
-margin-right:5px;
-}
-
-img{
--moz-box-shadow: 3px 3px 3px #ccc;
--webkit-box-shadow: 3px 3px 3px #ccc;
-box-shadow: 3px 3px 3px #ccc;
-border:#8E8D8D 2px solid;
-margin-left:0px;
-max-width: 800px;
-height: auto
-}
-
-b{
-font-weight:600;
-}
-
-.content{}
-
-.descr{
-margin-top:35px;
-/*max-width: 75%;*/
-margin-left:5px;
-text-align:justify;
-min-height:700px;
-vertical-align:top;
-}
-
-.name{
-max-width: 75%;
-font-weight:100;
-}
-
-tt{
-text-align:left;}
-
-/*
------------
-links
------------
-*/
-
-a:link{
-color: #2C418D;
-text-decoration: none;
-text-align:left;
-}
-
-a:hover{
-color: #869CD1;
-text-decoration:underline;
-text-align:left;
-}
-
-a:visited{
-color: #869CD1;
-text-decoration: none;
-text-align:left;
-}
-
-a:visited:hover{
-text-decoration:underline;
-text-align:left;
-}
-
-a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
-{
-text-decoration: none;
-background-image:url(../images/ico_out.png);
-background-repeat:no-repeat;
-background-position:left;
-padding-left:20px;
-text-align:left;
-}
-
-.flags{
-text-decoration:none;
-text-height:24px;
-}
-
-/*
--------------------------------
-NOTE styles
--------------------------------
-*/
-.notetitle, .tiptitle, .fastpathtitle{
-font-weight:bold;
-}
-
-.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{
-font-weight:bold;
-}
-
-.note,.tip,.fastpath{
-background: #F2F2F2 url(../images/ico_note.png);
-background-repeat: no-repeat;
-background-position: top left;
-padding:5px;
-padding-left:40px;
-padding-bottom:10px;
-border:#999 1px dotted;
-color:#666666;
-margin:5px;
-}
-
-.attention,.caution,.danger,.important,.remember,.restriction{
-background: #F2F2F2 url(../images/ico_note_attention.png);
-background-repeat:no-repeat;
-background-position:top left;
-padding:5px;
-padding-left:40px;
-padding-bottom:10px;
-border:#999 1px dotted;
-color:#666666;
-margin:5px;
-}
-
-/*
--------------------------------
-Top navigation
--------------------------------
-*/
-
-.header{
-
-height:1px;
-padding:0px;
-margin:0px;
-}
-
-.qtref{
-display: block;
-position: relative;
-top: -76px;
-height:15px;
-z-index: 1;
-font-size:11px;
-padding-right:10px;
-float:right;
-}
-
-.naviNextPrevious{
-display: block;
-position: relative;
-text-align: right;
-top: -53px;
-float:right;
-height:20px;
-z-index:1;
-padding-right:10px;
-padding-top:2px;
-vertical-align:top;
-margin:0px;
-}
-
-
-.naviNextPrevious > a.prevPage {
-background-image:url(../images/btn_prev.png);
-background-repeat:no-repeat;
-background-position:left;
-padding-left:20px;
-height:20px;
-padding-left:20px;
-}
-
-.naviNextPrevious > a.nextPage {
-background-image:url(../images/btn_next.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:20px;
-height:20px;
-margin-left:30px;
-}
-
-.breadcrumb{
-display: block;
-position: relative;
-top:-20px;
-/*border-top:2px solid #ffffff;*/
-border-bottom: 1px solid #cecece;
-background-color:#F2F2F2;
-z-index:1;
-height:20px;
-padding:0px;
-margin:0px;
-padding-left:10px;
-padding-top:2px;
-margin-left:-5px;
-margin-right:-5px;
-}
-
-.breadcrumb ul{
- margin:0px;
- padding:0px;
-}
-
-.breadcrumb ul li{
-background-color:#F2F2F2;
-list-style-type:none;
-padding:0;
-margin:0;
-height:20px;
-}
-
-.breadcrumb li{
-float:left;
-}
-
-.breadcrumb .first {
-background:url(../images/home.png);
-background-position:left;
-background-repeat:no-repeat;
-padding-left:20px;
-}
-
-
-.breadcrumb li a{
-color:#2C418D;
-display:block;
-text-decoration:none;
-background:url(../images/arrow_bc.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:25px;
-padding-left:10px;
-}
-
-.breadcrumb li a:hover{
-color:#909090;
-display:block;
-text-decoration:none;
-background:url(../images/arrow.png);
-background-repeat:no-repeat;
-background-position:right;
-padding-right:20px;
-padding-left:10px;
-}
-
-
-/* table of content
-no display
-*/
-
-/*
------------
-headers
------------
-*/
-
-
-@media screen{
-.title{
-color:#313131;
-font-size: 18px;
-font-weight: normal;
-left: 0;
-padding-bottom: 20px;
-padding-left: 10px;
-padding-top: 20px;
-position: absolute;
-right: 0;
-top: 0;
-background-color:#E6E6E6;
-border-bottom: 1px #CCC solid;
-border-top: 2px #CCC solid;
-font-weight:bold;
-margin-left:0px;
-margin-right:0px;
-}
-}
-
-h1 {
-margin: 0;
-}
-
-h2, p.h2 {
-font: 500 16px/1.2 Arial;
-font-weight:100;
-background-color:#F2F3F4;
-padding:4px;
-padding-left: 14px;
-margin-bottom:30px;
-margin-top:30px;
-margin-left: -10px;
-margin-right: -5px;
-border-top:#E0E0DE 1px solid;
-border-bottom: #E0E0DE 1px solid;
-}
-
-h3{
-
-font: 500 14px/1.2 Arial;
-font-weight:100;
-text-decoration:underline;
-margin-bottom:30px;
-margin-top:30px;
-}
-
-h3.fn,span.fn{
-border-width: 1px;
-border-style: solid;
-border-color: #E6E6E6;
--moz-border-radius: 7px 7px 7px 7px;
--webkit-border-radius: 7px 7px 7px 7px;
-border-radius: 7px 7px 7px 7px;
-background-color: #F6F6F6;
-word-spacing: 3px;
-padding: 5px 5px;
-text-decoration:none;
-font-weight:bold;
-max-width:75%;
-font-size:14px;
-margin:0px;
-margin-top:30px;
-
-}
-
-.name{
-color:#1A1A1A;
-}
-.type{
-color:#808080;
-}
-
-
-
-@media print {
-.title {
-color:#0066CB;
-font-family:Arial, Helvetica;
-font-size: 32px;
-font-weight: normal;
-left: 0;
-position: absolute;
-right: 0;
-top: 0;
-}
-}
-
-
-/*
------------------
-table styles
------------------
-*/
-.table img {
-border:none;
-margin-left:0px;
--moz-box-shadow:0px 0px 0px #fff;
--webkit-box-shadow: 0px 0px 0px #fff;
-box-shadow: 0px 0px 0px #fff;
-}
-
-/* table with border alternative colors*/
-
- table,pre{
--moz-border-radius: 7px 7px 7px 7px;
--webkit-border-radius: 7px 7px 7px 7px;
- border-radius: 7px 7px 7px 7px;
-background-color: #F6F6F6;
-border: 1px solid #E6E6E6;
-border-collapse: separate;
-font-size: 12px;
-line-height: 1.2;
-margin-bottom: 25px;
-margin-left: 15px;
-font-size: 12px;
-line-height: 1.2;
-margin-bottom: 25px;
-margin-left: 15px;
-}
-
-
-table th{
-text-align:left;
-padding-left:20px;
-}
-
-table td {
-padding: 3px 15px 3px 20px;
-border-bottom:#CCC dotted 1px;
-}
-table p { margin:0px;}
-
-table tr.even {
-background-color: white;
-color: #66666E;
-}
-
-table tr.odd {
-background-color: #F6F6F6;
-color: #66666E;
-}
-
-
-table thead {
-text-align:left;
-padding-left:20px;
-background-color:#e1e0e0;
-border-left:none;
-border-right:none;
-}
-
-table thead th {
-padding-top:5px;
-padding-left:10px;
-padding-bottom:5px;
-border-bottom: 2px solid #D1D1D1;
-padding-right:10px;
-}
-
-
-/* table bodless & white*/
-
-.borderless {
-border-radius: 0px 0px 0px 0px;
-background-color: #fff;
-border: 1px solid #fff;
-}
-
-.borderless tr {
-background-color: #FFF;
-color: #66666E;
-}
-
-.borderless td {
-border:none;
-border-bottom:#fff dotted 1px;
-}
-
-/*
------------
-List
------------
-*/
-
-ul{
-padding-bottom:2px;
-}
-
-li {
-margin-bottom: 10px;
-padding-left: 8px;
-list-style:outside;
-list-style-type:square;
-text-align:left;
-}
-
-
-ol{
-margin:10px;
-padding:0;
-}
-
-ol > li{
-margin-left: 30px;
-padding-left:8px;
-list-style:decimal;
-}
-
-.centerAlign{
-text-align: left;
-}
-
-.cpp{
-display: block;
-margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
-padding: 20px 0 20px 0;
-}
-
-.footer{
-margin-top: 50px;
-padding-left:5px;
-margin-bottom: 10px;
-font-size:10px;
-border-top: 1px solid #999;
-padding-top:11px;
-}
-
-.footer a[href*="http://"], a[href*="ftp://"],a[href*="https://"]{
-background-size: 13px 11px;
-padding-left: 16px;
-}
-
-.footerNavi{
-width:auto;
-text-align:right;
-margin-top:50px;
-z-index:1;
-}
-
-.memItemLeft{
-padding-right: 3px;
-}
-
-.memItemRight{
-padding: 3px 15px 3px 0;
-}
-
-.qml{
-display: block;
-margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
-padding: 20px 0 20px 0;
-}
-
-.qmldefault{
-padding-left: 5px;
-float: right;
-color: red;
-}
-
-.qmlreadonly{
-padding-left: 5px;
-float: right;
-color: #254117;
-}
-
-.rightAlign{
-padding: 3px 5px 3px 10px;
-text-align: right;
-}
-
-/*
------------
-Content table
------------
-*/
-
-@media print{
-.toc {
-float: right;
-padding-bottom: 10px;
-padding-top: 50px;
-width: 100%;
-background-image:url(../images/bgrContent.png);
-background-position:top;
-background-repeat:no-repeat;
-}
-}
-
-@media screen{
-.toc{
-clear:both;
-float:right;
-vertical-align:top;
--moz-border-radius: 7px 7px 7px 7px;
--webkit-border-radius: 7px 7px 7px 7px;
-border-radius: 7px 7px 7px 7px;
- background:#FFF url(../images/bgrContent.png);
-background-position:top;
-background-repeat:repeat-x;
-border: 1px solid #E6E6E6;
-padding-left:5px;
-padding-bottom:10px;
-height: auto;
-width: 200px;
-text-align:left;
-z-index:2;
-margin-left:20px;
-margin-right:20px;
-margin-top:0px;
-padding-top:0px;
-}
-}
-
-.toc h3{
-text-decoration:none;
-}
-
-.toc h3{font: 500 14px/1.2 Arial;
-font-weight:100;
-padding:0px;
-margin:0px;
-padding-top:5px;
-padding-left:5px;
-}
-
-
-.toc ul{
-width:160px;
-padding-left:10px;
-padding-right:5px;
-padding-top:10px;
-}
-
-.toc ul li{
-margin-left:20px;
-list-style-image:url(../images/blu_dot.png);
-list-style:outside;
-
-}
-
-
-.toc ul li a:link{
-color: #2C418D;
-text-decoration: none;
-}
-
-.toc ul li a:hover{
-color: #869CD1;
-text-decoration:underline;
-
-}
-
-.toc ul li a:visited{
-color: #869CD1;
-font-weight: bold;
-}
-
-.level1{
-border:none;}
-
-.clearfix{
-clear:both;}
-