diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 33 | ||||
-rw-r--r-- | doc/global/qt-module-defaults.qdocconf | 1 | ||||
-rw-r--r-- | doc/global/template/style/offline.css | 7 | ||||
-rw-r--r-- | doc/global/template/style/online.css | 4 |
4 files changed, 41 insertions, 4 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf new file mode 100644 index 0000000000..3bfc3e12d4 --- /dev/null +++ b/doc/global/manifest-meta.qdocconf @@ -0,0 +1,33 @@ +# Additional meta information (attributes for matched entries, as well as tags) +# to be added to manifest.xml files. +# +# manifestmeta.filters = <filter1>,<filter2>,... +# +# manifestmeta.<filter>.names = <Module1>/<name1>,<Module2>/<name2>,.. +# manifestmeta.<filter>.attributes = <attribute1:value1>,<attribute2:value2>,.. +# manifestmeta.<filter>.tags = <tag1>,<tag2>,.. +# +# <filter>.names specify all the module/name combinations to apply the +# attributes/tags to. You can use simple wildcard matching by appending +# '*' at the end of name. +# +# Note: You cannot use operators (+, =, -) in the names. +# +# Examples: add a 'isHighlighted' attribute for two 'Analog Clock' examples, +# add a 'database' tag for QtSql all examples, a 'webkit' tag for QtWebKit +# examples, and a 'qt5' tag for all examples +# +# manifestmeta.filters = highlighted sql webkit global +# +# manifestmeta.highlighted.names = "QtGui/Analog Clock Window Example" \ +# "QtWidgets/Analog Clock Example" +# manifestmeta.highlighted.attributes = isHighlighted:true +# +# manifestmeta.sql.names = "QtSql/*" +# manifestmeta.sql.tags = database +# +# manifestmeta.webkit.names = "QtWebKitExamples/*" +# manifestmeta.webkit.tags = webkit +# +# manifestmeta.global.names = * +# manifestmeta.global.tags = qt5 diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 15b3724355..0365d5a6cd 100644 --- a/doc/global/qt-module-defaults.qdocconf +++ b/doc/global/qt-module-defaults.qdocconf @@ -3,6 +3,7 @@ include(qt-cpp-ignore.qdocconf) include(qt-defines.qdocconf) include(qt-html-templates-offline.qdocconf) include(compat.qdocconf) +include(manifest-meta.qdocconf) dita.metadata.default.author = Qt Project dita.metadata.default.permissions = all diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 8b8a7d9ae1..40257730ff 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -290,14 +290,10 @@ box-shadow: 0px 0px 0px #fff; 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; } @@ -451,6 +447,9 @@ padding: 3px 5px 3px 10px; text-align: right; } +.qmldoc { +margin-left: 15px; +} /* ----------- Content table diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index f933bac5eb..9dff745358 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -563,6 +563,10 @@ padding: 3px 5px 3px 10px; text-align: right; } +.qmldoc { +margin-left: 15px; +} + /* ----------- Content table |