diff options
Diffstat (limited to 'src/svg')
33 files changed, 55 insertions, 59 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 diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index ec9bb17..ba2f3c4 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index b4e2dc2..166a1f2 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgfont.cpp b/src/svg/qsvgfont.cpp index e15d54d..73a1573 100644 --- a/src/svg/qsvgfont.cpp +++ b/src/svg/qsvgfont.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index fde90be..954e8d3 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp index c6ac690..8768844 100644 --- a/src/svg/qsvgfunctions_wince.cpp +++ b/src/svg/qsvgfunctions_wince.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgfunctions_wince.h b/src/svg/qsvgfunctions_wince.h index 690e8f8..3a88ed8 100644 --- a/src/svg/qsvgfunctions_wince.h +++ b/src/svg/qsvgfunctions_wince.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 47f760b..ccd390f 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.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 QtSvg module of the Qt Toolkit. @@ -175,7 +175,7 @@ public: void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); void drawTextItem(const QPointF &pt, const QTextItem &item); void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlag = Qt::AutoColor); + Qt::ImageConversionFlags flags = Qt::AutoColor); QPaintEngine::Type type() const { return QPaintEngine::SVG; } @@ -907,7 +907,7 @@ void QSvgPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, void QSvgPaintEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlag flags) + Qt::ImageConversionFlags flags) { //Q_D(QSvgPaintEngine); diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 6ba0aa1..f04a639 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 291cf64..00514d0 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 397c741..8118731 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 475ef74..e021bdb 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index 72fcd79..56eb226 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index 53333d2..f259da0 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h index 5e4d32d..ba1f58f 100644 --- a/src/svg/qsvgnode_p.h +++ b/src/svg/qsvgnode_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp index 68a97bf..db4d7e2 100644 --- a/src/svg/qsvgrenderer.cpp +++ b/src/svg/qsvgrenderer.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index cafe94d..3e1c88e 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index 37a2a8d..1419dd2 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index 6751e56..0e96a13 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 4d5a480..ea28f1e 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index e3bd745..b695a18 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index 218d108..b05bd9a 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index b93f515..3967ae8 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index 698d9d6..b4b835e 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 02098f3..e95bc48 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -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 QtSvg module of the Qt Toolkit. diff --git a/src/svg/svg.pro b/src/svg/svg.pro index bfae661..8ee9061 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -1,6 +1,6 @@ TARGET = QtSvg QT = core-private gui-private -!contains(QT_CONFIG, no-widgets): QT += widgets-private +qtHaveModule(widgets): QT += widgets-private DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 @@ -44,14 +44,9 @@ wince*: { qsvgfunctions_wince.h } -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -symbian:TARGET.UID3=0x2001B2E2 - contains(QT_CONFIG, system-zlib) { - symbian: LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + if(unix|win32-g++*): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { - include(../3rdparty/zlib.pri) + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib } |