diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:09:02 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:09:02 +0100 |
commit | c849591e76fc80b0eea262e8a1ae3e6b3f03429c (patch) | |
tree | c85670103bca8a6be34e86c79c6445e765482c3d /src/svg | |
parent | f650f1a2c6d2c995cda16f11a6281936f699cab7 (diff) | |
parent | 84abe5fcf2a70de7bf8503641e8617383693882e (diff) | |
download | qtsvg-c849591e76fc80b0eea262e8a1ae3e6b3f03429c.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9b3bad61dde9a1e21a3501c204b8afc664a04556
Diffstat (limited to 'src/svg')
29 files changed, 39 insertions, 39 deletions
diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index 88fd510..e562f69 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -3,20 +3,20 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtSvg description = Qt SVG Reference Documentation -url = http://qt-project.org/doc/qtsvg -version = 5.0.1 +url = http://qt-project.org/doc/qt-$QT_VER/qtsvg +version = $QT_VERSION qhp.projects = QtSvg qhp.QtSvg.file = qtsvg.qhp -qhp.QtSvg.namespace = org.qt-project.qtsvg.500 +qhp.QtSvg.namespace = org.qt-project.qtsvg.$QT_VERSION_TAG qhp.QtSvg.virtualFolder = qtsvg qhp.QtSvg.indexTitle = Qt SVG qhp.QtSvg.indexRoot = -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.filterAttributes = qtsvg $QT_VERSION qtrefdoc +qhp.QtSvg.customFilters.Qt.name = QtSvg $QT_VERSION +qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg $QT_VERSION qhp.QtSvg.subprojects = classes qhp.QtSvg.subprojects.classes.title = C++ Classes qhp.QtSvg.subprojects.classes.indexTitle = Qt SVG C++ Classes diff --git a/src/svg/doc/src/qtsvg-index.qdoc b/src/svg/doc/src/qtsvg-index.qdoc index 89769dc..3f598b7 100644 --- a/src/svg/doc/src/qtsvg-index.qdoc +++ b/src/svg/doc/src/qtsvg-index.qdoc @@ -3,7 +3,7 @@ ** 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/qtsvg.qdoc b/src/svg/doc/src/qtsvg.qdoc index a25dec3..e49b36a 100644 --- a/src/svg/doc/src/qtsvg.qdoc +++ b/src/svg/doc/src/qtsvg.qdoc @@ -3,7 +3,7 @@ ** 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/svglicense.qdoc b/src/svg/doc/src/svglicense.qdoc index 7d5aff5..a357cbd 100644 --- a/src/svg/doc/src/svglicense.qdoc +++ b/src/svg/doc/src/svglicense.qdoc @@ -3,7 +3,7 @@ ** 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 23a5c08..3ef66d5 100644 --- a/src/svg/doc/src/svgrendering.qdoc +++ b/src/svg/doc/src/svgrendering.qdoc @@ -3,7 +3,7 @@ ** 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/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index ba2f3c4..d5ead78 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/src/svg/qgraphicssvgitem.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -134,7 +134,7 @@ public: mode to speedup the display of items. Caching can be disabled by passing QGraphicsItem::NoCache to the QGraphicsItem::setCacheMode() method. - \sa QSvgWidget, {Qt Svg C++ Classes}, QGraphicsItem, QGraphicsView + \sa QSvgWidget, {Qt SVG C++ Classes}, QGraphicsItem, QGraphicsView */ /*! diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 8172d0c..09cda2a 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgfont.cpp b/src/svg/qsvgfont.cpp index 73a1573..cc74793 100644 --- a/src/svg/qsvgfont.cpp +++ b/src/svg/qsvgfont.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index 954e8d3..6291888 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp index 699a5b0..59f7157 100644 --- a/src/svg/qsvgfunctions_wince.cpp +++ b/src/svg/qsvgfunctions_wince.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgfunctions_wince_p.h b/src/svg/qsvgfunctions_wince_p.h index abb224c..e8b770c 100644 --- a/src/svg/qsvgfunctions_wince_p.h +++ b/src/svg/qsvgfunctions_wince_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index ccd390f..a2d4589 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -94,7 +94,7 @@ public: outputDevice = 0; resolution = 72; - attributes.document_title = QLatin1String("Qt Svg Document"); + attributes.document_title = QLatin1String("Qt SVG Document"); attributes.document_description = QLatin1String("Generated with Qt"); attributes.font_family = QLatin1String("serif"); attributes.font_size = QLatin1String("10pt"); @@ -540,7 +540,7 @@ public: The \l{SVG Generator Example} shows how the same painting commands can be used for painting a widget and writing an SVG file. - \sa QSvgRenderer, QSvgWidget, {Qt Svg C++ Classes} + \sa QSvgRenderer, QSvgWidget, {Qt SVG C++ Classes} */ /*! diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index c0f1e0e..44e9ced 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 00514d0..b8ee7ba 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 8118731..b881a4d 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index e021bdb..63bdd24 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index 56eb226..0bb830c 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index f259da0..f082502 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h index ba1f58f..3606895 100644 --- a/src/svg/qsvgnode_p.h +++ b/src/svg/qsvgnode_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp index db4d7e2..afa728b 100644 --- a/src/svg/qsvgrenderer.cpp +++ b/src/svg/qsvgrenderer.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE Finally, the QSvgRenderer class provides the repaintNeeded() signal which is emitted whenever the rendering of the document needs to be updated. - \sa QSvgWidget, {Qt Svg C++ Classes}, {SVG Viewer Example}, QPicture + \sa QSvgWidget, {Qt SVG C++ Classes}, {SVG Viewer Example}, QPicture */ class QSvgRendererPrivate : public QObjectPrivate diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index c5aba90..395f093 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index 1419dd2..0b46535 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index 0e96a13..7203681 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index ea28f1e..16a2ad1 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index b695a18..d30f18e 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index b05bd9a..79537d3 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index 3967ae8..8f8daf4 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index b4b835e..dfe3b17 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE displays. If no data has been loaded, the widget provides the default QWidget size hint. Subclass this class and reimplement sizeHint() if you need to customize this behavior. - \sa QSvgRenderer, {Qt Svg C++ Classes}, QPicture + \sa QSvgRenderer, {Qt SVG C++ Classes}, QPicture */ class QSvgWidgetPrivate : public QWidgetPrivate diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index a5ab0a7..e91b974 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage |