From fbc18abf5a1ab1b0e74c4d240af8bf7e8381667c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 26 Nov 2015 12:53:33 +0100 Subject: Ignore Q_SERIALBUS_EXPORT and Q_DECL_EQ_DEFAULT in qdoc Change-Id: I3ec9170aba408e8c01c7940f2537a017dbeae065 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/global') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 8649a14582..967bbb8ede 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -39,6 +39,7 @@ Cpp.ignoretokens += \ Q_DECL_UNUSED \ Q_DECL_CF_RETURNS_RETAINED \ Q_DECL_NS_RETURNS_AUTORELEASED \ + Q_DECL_EQ_DEFAULT \ Q_DECLARATIVE_EXPORT \ Q_EXPLICIT \ Q_EXPORT \ @@ -78,6 +79,7 @@ Cpp.ignoretokens += \ Q_REQUIRED_RESULT \ Q_SCRIPT_EXPORT \ Q_SCRIPTTOOLS_EXPORT \ + Q_SERIALBUS_EXPORT \ Q_SQL_EXPORT \ Q_SVG_EXPORT \ Q_TESTLIB_EXPORT \ -- cgit v1.2.3 From 60e2aa6532c81dbc6bc23d855ee7050f2744d0c0 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Wed, 11 Nov 2015 14:03:38 +0100 Subject: Doc: Add ordered list-specific styles These additional styles enable the use of lower and uppercase alphabets to number the list items. They are useful especially in nested ordered lists where numbering all the list items using decimal numbers could be confusing. Change-Id: If1bdf98ff37c2c191d66dfb66a3e8f20d8fa83e5 Reviewed-by: Venugopal Shivashankar --- doc/global/template/style/offline.css | 13 ++++++++++++- doc/global/template/style/online.css | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) (limited to 'doc/global') diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 123d753290..5aabd82dcb 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -515,15 +515,26 @@ li { margin-bottom: 10px; padding-left: 8px; list-style: outside; - list-style-type: square; text-align: left; } + ul > li { + list-style-type: square; + } + ol { margin: 10px; padding: 0; } +ol.A > li { + list-style-type: upper-alpha; +} + +ol.a > li{ + list-style-type: lower-alpha; +} + ol > li { margin-left: 30px; padding-left: 8px; diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index a98382e083..86e30e89b3 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -975,9 +975,23 @@ ol,ul { margin-top:0.75em; margin-left:20px } + +.context ol > li { + margin-left: 20px +} + .mainContent ol>li { - list-style-type:decimal + list-style-type: decimal; +} + +.mainContent ol.a >li { + list-style-type: lower-alpha; +} + +.mainContent ol.A >li { + list-style-type: upper-alpha; } + blockquote,q { quotes:none } -- cgit v1.2.3 From 6c0f89b9274380a637af00536dde5128cb967c25 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 26 Nov 2015 14:04:34 +0100 Subject: Doc: Update the list of highlighted examples Change-Id: Id4459ca978e9f126f04224722565b97552dfa0ef Task-number: QTBUG-49458 Reviewed-by: Sami Makkonen Reviewed-by: Venugopal Shivashankar --- doc/global/manifest-meta.qdocconf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'doc/global') diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index b5eaf96a3f..c45470838a 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -43,16 +43,21 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuick/Qt Quick Demo - Clocks" \ "QtQuick/Qt Quick Examples - Shader Effects" \ "QtQuickExtras/Qt Quick Extras - Dashboard" \ + "QtQuickExtras/Qt Quick Extras - Flat" \ "QtQuickExtras/Qt Quick Extras - Gallery" \ "QtQuickControls/Qt Quick Controls - Gallery" \ "QtQuickControls/Qt Quick Controls - Text Editor Example" \ "QtQuickControls/Qt Quick Controls - Table View Example" \ "QtQuickControls/Qt Quick Controls - Calendar Example" \ + "QtQuickControls/Qt Quick Controls - File System Browser Example" \ "QtQuickDialogs/Qt Quick System Dialog Examples" \ "QtWinExtras/Quick Player" \ "QtMultimedia/QML Video Shader Effects Example" \ "QtCanvas3D/Planets Example" \ - "QtLocation/Map Viewer (QML)" + "QtCanvas3D/Interactive Mobile Phone Example" \ + "QtLocation/Map Viewer (QML)" \ + "QtWebEngine/WebEngine Quick Nano Browser" \ + "QtWebEngine/Markdown Editor Example" manifestmeta.highlighted.attributes = isHighlighted:true -- cgit v1.2.3