diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:32:39 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 17:33:15 +0200 |
| commit | a5d34b34fbd867bd13ce94cdaf55d96576d4d14d (patch) | |
| tree | bb3b8b902f13bda65e49485a789f0eca07329ab5 /doc/global | |
| parent | 5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 (diff) | |
| parent | a23ff58d716f62b02ec825a3ea3c6b07616ee3f0 (diff) | |
Merge branch 'stable' into dev
Change-Id: I37d85631ab1165ab91457d8880c4da907a9df73b
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/manifest-meta.qdocconf | 27 | ||||
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 1 |
2 files changed, 27 insertions, 1 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 6b55e0dbad..20419f1b29 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -32,7 +32,7 @@ # manifestmeta.global.names = * # manifestmeta.global.tags = qt5 -manifestmeta.filters = highlighted webkit1 webkit2 android +manifestmeta.filters = highlighted webkit1 webkit2 android thumbnail manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuick/Qt Quick Demo - Photo Surface" \ @@ -168,3 +168,28 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtWidgets/Address Book Example" manifestmeta.android.tags = android + +# add a generic thumbnail image to examples that do not have any images in their documentation +manifestmeta.thumbnail.attributes = "imageUrl:qthelp\://org.qt-project.qtdoc.$QT_VERSION_TAG/qtdoc/images/qt-codesample.png" + +manifestmeta.thumbnail.names = "QtConcurrent/Map Example" \ + "QtConcurrent/QtConcurrent Word Count Example" \ + "QtConcurrent/Run Function Example" \ + "QtGui/Raster Window Example" \ + "QtNetwork/Network Download*" \ + "QtWidgets/Dynamic Layouts Example" \ + "QtWidgets/Event Transitions Example" \ + "QtWidgets/Plug & Paint Basic Tools Example" \ + "QtWidgets/Plug & Paint Extra Filters Example" \ + "QtWidgets/Two-way Button Example" \ + "QtWidgets/Validators Example" \ + "ActiveQt/*" \ + "QtDbus/*" \ + "QtHelp/*" \ + "QtMultimedia/AudioEngine Example" \ + "QtMultimedia/Declarative Radio Example" \ + "QtMultimedia/Media Player Example" \ + "QtQml/Extending QML*" \ + "QtQuick/Qt Quick Examples - Accessibility" \ + "QtSensors/Qt Sensors - SensorGesture QML Type example" \ + "QtWinExtras/Icon Extractor" diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 6966e2c4c1..406e37af08 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -26,6 +26,7 @@ Cpp.ignoretokens += \ Q_CORE_EXPORT_INLINE \ Q_DBUS_EXPORT \ Q_DECL_CONSTEXPR \ + Q_DECL_DEPRECATED \ Q_DECL_NOEXCEPT \ Q_DECL_NOTHROW \ Q_DECLARATIVE_EXPORT \ |