diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
commit | d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0 (patch) | |
tree | f01009393fe34a9a7bd42785b4211ce67e2088a2 /src/svg/doc | |
parent | f88807e62f48c0e4f714a40d306e1ed0caaa932a (diff) | |
parent | 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c (diff) | |
download | qtsvg-d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
Diffstat (limited to 'src/svg/doc')
-rw-r--r-- | src/svg/doc/qtsvg.qdocconf | 17 | ||||
-rw-r--r-- | src/svg/doc/snippets/doc_src_qtsvg.cpp | 2 | ||||
-rw-r--r-- | src/svg/doc/snippets/doc_src_qtsvg.pro | 2 | ||||
-rw-r--r-- | src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp | 2 | ||||
-rw-r--r-- | src/svg/doc/src/qtsvg-index.qdoc | 10 | ||||
-rw-r--r-- | src/svg/doc/src/qtsvg.qdoc | 8 | ||||
-rw-r--r-- | src/svg/doc/src/svglicense.qdoc | 4 | ||||
-rw-r--r-- | src/svg/doc/src/svgrendering.qdoc | 6 |
8 files changed, 26 insertions, 25 deletions
diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index 7eb2464..88fd510 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -2,30 +2,31 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtSvg -description = Qt Svg Reference Documentation +description = Qt SVG Reference Documentation url = http://qt-project.org/doc/qtsvg -version = 5.0.0 +version = 5.0.1 qhp.projects = QtSvg qhp.QtSvg.file = qtsvg.qhp qhp.QtSvg.namespace = org.qt-project.qtsvg.500 qhp.QtSvg.virtualFolder = qtsvg -qhp.QtSvg.indexTitle = Qt Svg +qhp.QtSvg.indexTitle = Qt SVG qhp.QtSvg.indexRoot = -qhp.QtSvg.filterAttributes = qtsvg 5.0.0 qtrefdoc -qhp.QtSvg.customFilters.Qt.name = QtSvg 5.0.0 -qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg 5.0.0 +qhp.QtSvg.filterAttributes = qtsvg 5.0.1 qtrefdoc +qhp.QtSvg.customFilters.Qt.name = QtSvg 5.0.1 +qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg 5.0.1 qhp.QtSvg.subprojects = classes qhp.QtSvg.subprojects.classes.title = C++ Classes -qhp.QtSvg.subprojects.classes.indexTitle = Qt Svg C++ Classes +qhp.QtSvg.subprojects.classes.indexTitle = Qt SVG C++ Classes qhp.QtSvg.subprojects.classes.selectors = class fake:headerfile qhp.QtSvg.subprojects.classes.sortPages = true depends += qtcore \ qtwidgets \ - qtgui + qtgui \ + qtdesigner tagfile = ../../../doc/qtsvg/qtsvg.tags diff --git a/src/svg/doc/snippets/doc_src_qtsvg.cpp b/src/svg/doc/snippets/doc_src_qtsvg.cpp index 3fdddf2..86bd52b 100644 --- a/src/svg/doc/snippets/doc_src_qtsvg.cpp +++ b/src/svg/doc/snippets/doc_src_qtsvg.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/svg/doc/snippets/doc_src_qtsvg.pro b/src/svg/doc/snippets/doc_src_qtsvg.pro index c748f13..f6bd8d8 100644 --- a/src/svg/doc/snippets/doc_src_qtsvg.pro +++ b/src/svg/doc/snippets/doc_src_qtsvg.pro @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp b/src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp index af175cb..2dae0af 100644 --- a/src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp +++ b/src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/svg/doc/src/qtsvg-index.qdoc b/src/svg/doc/src/qtsvg-index.qdoc index 6208646..89769dc 100644 --- a/src/svg/doc/src/qtsvg-index.qdoc +++ b/src/svg/doc/src/qtsvg-index.qdoc @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the documentation of the Qt Svg Module. +** This file is part of the documentation of the Qt SVG Module. ** ** $QT_BEGIN_LICENSE:FDL$ ** Commercial License Usage @@ -28,7 +28,7 @@ /*! \title Qt SVG \page qtsvg-index.html - \brief Qt Svg provides functionality for handling SVG images. + \brief Qt SVG provides functionality for handling SVG images. Scalable Vector Graphics (SVG) is an XML-based language for describing two-dimensional vector graphics. Qt provides classes @@ -56,10 +56,10 @@ \section1 References \list - \li \l{Qt Svg C++ Classes} + \li \l{Qt SVG C++ Classes} \endlist - Qt Svg comes with the following examples: + Qt SVG comes with the following examples: \list \li \l{SVG Generator Example} diff --git a/src/svg/doc/src/qtsvg.qdoc b/src/svg/doc/src/qtsvg.qdoc index ffdc15e..a25dec3 100644 --- a/src/svg/doc/src/qtsvg.qdoc +++ b/src/svg/doc/src/qtsvg.qdoc @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the documentation of the Qt Svg Module. +** This file is part of the documentation of the Qt SVG Module. ** ** $QT_BEGIN_LICENSE:FDL$ ** Commercial License Usage @@ -27,10 +27,10 @@ /*! \module QtSvg - \title Qt Svg C++ Classes + \title Qt SVG C++ Classes \ingroup modules - \brief The Qt Svg module provides functionality for handling SVG images. + \brief The Qt SVG module provides functionality for handling SVG images. Scalable Vector Graphics (SVG) is an XML-based language for describing two-dimensional vector graphics. Qt provides classes diff --git a/src/svg/doc/src/svglicense.qdoc b/src/svg/doc/src/svglicense.qdoc index 9aa5e1b..7d5aff5 100644 --- a/src/svg/doc/src/svglicense.qdoc +++ b/src/svg/doc/src/svglicense.qdoc @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the documentation of the Qt Svg Module. +** This file is part of the documentation of the Qt SVG Module. ** ** $QT_BEGIN_LICENSE:FDL$ ** Commercial License Usage diff --git a/src/svg/doc/src/svgrendering.qdoc b/src/svg/doc/src/svgrendering.qdoc index 02e4e12..23a5c08 100644 --- a/src/svg/doc/src/svgrendering.qdoc +++ b/src/svg/doc/src/svgrendering.qdoc @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the documentation of the Qt Svg Module. +** This file is part of the documentation of the Qt SVG Module. ** ** $QT_BEGIN_LICENSE:FDL$ ** Commercial License Usage @@ -52,7 +52,7 @@ can read more about SVG at \l{About SVG}. Qt supports the \l{SVG 1.2 Tiny Static Features}{static features} of - \l{SVG 1.2 Tiny}. ECMA scripts and DOM manipulation are currently not + \l{http://www.w3.org/TR/SVGMobile12}{SVG 1.2 Tiny}. ECMA scripts and DOM manipulation are currently not supported. SVG drawings can be rendered onto any QPaintDevice subclass. This |