From 1b5ab11d2892d63ae3d4527e59ddc3d69f1db5bd Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sat, 14 Sep 2013 20:36:38 +0200 Subject: Make qdoc ignore the Q_DECL_DEPRECATED token Task-number: QTBUG-27829 Change-Id: Ic3d25cd7da2a2c1266dfa113b7138f4086215777 Reviewed-by: Martin Smith --- doc/global/qt-cpp-ignore.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf index 1f34f366cb..6fb8953b0d 100644 --- a/doc/global/qt-cpp-ignore.qdocconf +++ b/doc/global/qt-cpp-ignore.qdocconf @@ -7,6 +7,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 \ -- cgit v1.2.3 From 5ee6c2490123ad9d742d007e68bd5a3dab2b3dfe Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 17 Sep 2013 10:48:58 +0200 Subject: Doc: Define a generic thumbnail for a number of examples Add examples that do not have any images in their documentation into manifest-meta qdocconf file, and define a generic image to use as a thumbnail in Qt Creator Welcome mode. Task-number: QTBUG-31314 Change-Id: I1625bf15cbaa53e940a07b1828dc77ca5ba45ccc Reviewed-by: Jerome Pasion --- doc/global/manifest-meta.qdocconf | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'doc') 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" -- cgit v1.2.3