diff options
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/config.qdocconf | 4 | ||||
| -rw-r--r-- | doc/global/manifest-meta.qdocconf | 22 | ||||
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 1 | ||||
| -rw-r--r-- | doc/global/template/style/offline-simple.css | 4 | ||||
| -rw-r--r-- | doc/global/template/style/offline.css | 3 | ||||
| -rw-r--r-- | doc/global/template/style/online.css | 10 |
6 files changed, 20 insertions, 24 deletions
diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 0c22d70529..a18396876d 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -13,3 +13,7 @@ navigation.homepage = "Qt $QT_VER" sourcedirs += includes $$BUILDDIR url = http://doc.qt.io/qt-5 + +# Uncomment the following two lines to generate documentation marked as \internal +# alias.internal = disable +# macro.internal.HTML = "<span style="color:red">[internal]</span>" diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 4ef14d3486..3db67a3131 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -30,28 +30,6 @@ manifestmeta.filters = highlighted android thumbnail ios -manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ - "QtQuick/Qt Quick Demo - Photo Surface" \ - "QtQuick/Qt Quick Demo - Tweet Search" \ - "QtQuick/Qt Quick Demo - Calqlatr" \ - "QtQuick/Qt Quick Demo - StocQt" \ - "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" \ - "QtQuickControls2/Qt Quick Controls 2 - Gallery" \ - "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \ - "QtQuickDialogs/Qt Quick System Dialog Examples" \ - "QtWinExtras/Quick Player" \ - "QtMultimedia/QML Video Shader Effects Example" \ - "QtCanvas3D/Interactive Mobile Phone Example" \ - "QtLocation/Map Viewer (QML)" \ - "QtBluetooth/Bluetooth Low Energy Heart Rate Game" \ - "QtCharts/Chart Themes Example" \ - "QtDataVisualization/Bars Example" \ - "QtDataVisualization/Surface Example" - manifestmeta.highlighted.attributes = isHighlighted:true manifestmeta.android.names = "QtQuick/Qt Quick Demo - Calqlatr" \ diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index e185c20b8f..4dbe144913 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -113,7 +113,6 @@ Cpp.ignoretokens += \ Q_GUI_EXPORT_STYLE_POCKETPC \ Q_GUI_EXPORT_STYLE_SGI \ Q_GUI_EXPORT_STYLE_WINDOWS \ - Q_GUI_EXPORT_STYLE_WINDOWSXP \ Q_INLINE_TEMPLATE \ Q_INTERNAL_WIN_NO_THROW \ Q_INVOKABLE \ diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css index 043e42981d..82e99c42ac 100644 --- a/doc/global/template/style/offline-simple.css +++ b/doc/global/template/style/offline-simple.css @@ -77,7 +77,9 @@ h3.fn, span.fn { font-weight: 400; margin: 45px 0px 0px 6px; } - +.fngroup h3.fngroupitem { + margin-bottom: 5px; +} table { max-width: 80%; padding: 15px 45px 15px 15px; diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index a65cf48d91..13c942707a 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -384,6 +384,9 @@ h3.fn, span.fn { margin: 0px; margin-top: 45px; } +.fngroup h3.fngroupitem { + margin-bottom: 5px; +} h3.fn code { float: right; } diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index 2d758f5301..7d84863b74 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -933,6 +933,16 @@ h1,h2,h3,h4,h5,h6 { border-bottom:2px #eee solid; word-wrap:break-word } +.context .fngroup { + border-bottom:2px #eee solid; + padding-bottom:15px; + margin-bottom:1.5em +} +.context .fngroup h3.fngroupitem { + margin:0; + padding-bottom:0; + border:none +} .context h3.fn .name, .context h3 span.type, .qmlname span.name { |