diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-02 23:33:06 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-02 23:33:06 +0100 |
commit | 72f5867f144cec8fc7848cbcc772683fe845652d (patch) | |
tree | 7513af27b59332bf111f406d304977adc8c8612e /doc/global | |
parent | 13777097118c496391d4b9656b95097ac25e4a40 (diff) | |
parent | bf0af8b5a24de7e595929a64948a3548936aaaee (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/kernel/qcoreapplication.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/network/bearer/qnetworkconfiguration.cpp
src/plugins/bearer/blackberry/qbbengine.cpp
src/plugins/platforms/android/androidjnimain.cpp
src/plugins/platforms/android/qandroidplatformtheme.cpp
src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
src/plugins/platforms/qnx/qqnxwindow.cpp
src/widgets/kernel/qwidgetwindow.cpp
src/widgets/styles/qwindowsvistastyle.cpp
src/widgets/styles/qwindowsxpstyle.cpp
src/widgets/widgets/qtoolbararealayout.cpp
tests/auto/corelib/global/qflags/qflags.pro
tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
Diffstat (limited to 'doc/global')
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 7 | ||||
-rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 2 | ||||
-rw-r--r-- | doc/global/template/style/offline.css | 13 | ||||
-rw-r--r-- | doc/global/template/style/online.css | 16 |
4 files changed, 35 insertions, 3 deletions
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 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 \ 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 } |