diff options
38 files changed, 44 insertions, 829 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 index cc5a670..5fea7ba 100644 --- a/dist/changes-5.0.1 +++ b/dist/changes-5.0.1 @@ -19,33 +19,4 @@ information about a particular change. * General * **************************************************************************** -General Improvements --------------------- - -Third party components ----------------------- - -**************************************************************************** -* Library * -**************************************************************************** - - -**************************************************************************** -* Platform Specific Changes * -**************************************************************************** - - -**************************************************************************** -* Compiler Specific Changes * -**************************************************************************** - - -**************************************************************************** -* Tools * -**************************************************************************** - - -**************************************************************************** -* Plugins * -**************************************************************************** - + - This release contains only minor code improvements. diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf deleted file mode 100644 index 9f2d28f..0000000 --- a/doc/global/qt-html-templates-offline.qdocconf +++ /dev/null @@ -1,32 +0,0 @@ -HTML.nobreadcrumbs = "true" - -HTML.stylesheets = global/style/offline.css - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" - -HTML.endheader = \ - "</head>\n" \ - -HTML.footer = \ - "<div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \ - " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \ - " <p>\n" \ - " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \ - " www.qt-project.org</a>.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - "</div>\n" \ - diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf deleted file mode 100644 index 4532af5..0000000 --- a/doc/global/qt-module-defaults.qdocconf +++ /dev/null @@ -1,97 +0,0 @@ -codeindent = 1 - -Cpp.ignoretokens = \ - QDBUS_EXPORT \ - QT_ASCII_CAST_WARN \ - QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ - QT_BEGIN_INCLUDE_NAMESPACE \ - QT_BEGIN_NAMESPACE \ - QT_BOOTSTRAPPED \ - QT_DESIGNER_STATIC \ - QT_END_HEADER \ - QT_END_INCLUDE_NAMESPACE \ - QT_END_NAMESPACE \ - QT_FASTCALL \ - Q_AUTOTEST_EXPORT \ - Q_COMPAT_EXPORT \ - Q_CORE_EXPORT \ - Q_CORE_EXPORT_INLINE \ - Q_DBUS_EXPORT \ - Q_DECL_CONSTEXPR \ - Q_DECL_NOEXCEPT \ - Q_DECL_NOTHROW \ - Q_EXPORT \ - Q_EXPORT_PLUGIN \ - Q_EXPORT_PLUGIN2 \ - Q_GADGET \ - Q_GUI_EXPORT \ - Q_GUI_EXPORT_INLINE \ - Q_INLINE_TEMPLATE \ - Q_INVOKABLE \ - Q_NETWORK_EXPORT \ - Q_OPENGL_EXPORT \ - Q_OPENVG_EXPORT \ - Q_OUTOFLINE_TEMPLATE \ - Q_PRINTSUPPORT_EXPORT \ - Q_SQL_EXPORT \ - Q_SVG_EXPORT \ - Q_SCRIPT_EXPORT \ - Q_SCRIPTTOOLS_EXPORT \ - Q_WIDGETS_EXPORT \ - Q_XML_EXPORT \ - Q_XMLPATTERNS_EXPORT - -Cpp.ignoredirectives = \ - __attribute__ \ - QT_FORWARD_DECLARE_CLASS \ - Q_CLASSINFO \ - Q_DECLARE_INTERFACE \ - Q_DECLARE_METATYPE \ - Q_DECLARE_OPERATORS_FOR_FLAGS \ - Q_DECLARE_PRIVATE \ - Q_DECLARE_PUBLIC \ - Q_DECLARE_PRIVATE_D \ - Q_DECLARE_SHARED \ - Q_DECLARE_TR_FUNCTIONS \ - Q_DECLARE_TYPEINFO \ - Q_DISABLE_COPY \ - Q_DUMMY_COMPARISON_OPERATOR \ - Q_ENUMS \ - Q_FLAGS \ - Q_INTERFACES \ - Q_PRIVATE_PROPERTY - -defines = Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - QT_DEPRECATED_* \ - Q_NO_USING_KEYWORD \ - __cplusplus \ - Q_COMPILER_INITIALIZER_LISTS - -dita.metadata.default.author = Qt Project -dita.metadata.default.permissions = all -dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2012 -dita.metadata.default.copyrholder = Digia Plc -dita.metadata.default.audience = programmer - -naturallanguage = en_US -outputencoding = UTF-8 -sourceencoding = UTF-8 - -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" -examples.imageextensions = "*.png *.jpg *.gif" - -headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" - -versionsym = QT_VERSION_STR - diff --git a/doc/global/style/offline.css b/doc/global/style/offline.css deleted file mode 100644 index 1b430ab..0000000 --- a/doc/global/style/offline.css +++ /dev/null @@ -1,622 +0,0 @@ -body{ -font: normal 400 14px/1.2 Arial; -margin-top:85px; -font-family: Arial, Helvetica; -color:#313131; -text-align:justify; -margin-left:5px; -margin-right:5px; -} - -img{ --moz-box-shadow: 3px 3px 3px #ccc; --webkit-box-shadow: 3px 3px 3px #ccc; -box-shadow: 3px 3px 3px #ccc; -border:#8E8D8D 2px solid; -margin-left:0px; -max-width: 800px; -height: auto -} - -b{ -font-weight:600; -} - -.content{} - -.descr{ -margin-top:35px; -/*max-width: 75%;*/ -margin-left:5px; -text-align:justify; -min-height:700px; -vertical-align:top; -} - -.name{ -max-width: 75%; -font-weight:100; -} - -tt{ -text-align:left;} - -/* ------------ -links ------------ -*/ - -a:link{ -color: #2C418D; -text-decoration: none; -text-align:left; -} - -a:hover{ -color: #869CD1; -text-decoration:underline; -text-align:left; -} - -a:visited{ -color: #869CD1; -text-decoration: none; -text-align:left; -} - -a:visited:hover{ -text-decoration:underline; -text-align:left; -} - -a[href*="http://"], a[href*="ftp://"],a[href*="https://"] -{ -text-decoration: none; -background-image:url(../images/ico_out.png); -background-repeat:no-repeat; -background-position:left; -padding-left:20px; -text-align:left; -} - -.flags{ -text-decoration:none; -text-height:24px; -} - -/* -------------------------------- -NOTE styles -------------------------------- -*/ -.notetitle, .tiptitle, .fastpathtitle{ -font-weight:bold; -} - -.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{ -font-weight:bold; -} - -.note,.tip,.fastpath{ -background: #F2F2F2 url(../images/ico_note.png); -background-repeat: no-repeat; -background-position: top left; -padding:5px; -padding-left:40px; -padding-bottom:10px; -border:#999 1px dotted; -color:#666666; -margin:5px; -} - -.attention,.caution,.danger,.important,.remember,.restriction{ -background: #F2F2F2 url(../images/ico_note_attention.png); -background-repeat:no-repeat; -background-position:top left; -padding:5px; -padding-left:40px; -padding-bottom:10px; -border:#999 1px dotted; -color:#666666; -margin:5px; -} - -/* -------------------------------- -Top navigation -------------------------------- -*/ - -.header{ - -height:1px; -padding:0px; -margin:0px; -} - -.qtref{ -display: block; -position: relative; -top: -76px; -height:15px; -z-index: 1; -font-size:11px; -padding-right:10px; -float:right; -} - -.naviNextPrevious{ -display: block; -position: relative; -text-align: right; -top: -53px; -float:right; -height:20px; -z-index:1; -padding-right:10px; -padding-top:2px; -vertical-align:top; -margin:0px; -} - - -.naviNextPrevious > a:first-child{ -background-image:url(../images/btn_prev.png); -background-repeat:no-repeat; -background-position:left; -padding-left:20px; -height:20px; -padding-left:20px; -} - -.naviNextPrevious > a:last-child{ -background-image:url(../images/btn_next.png); -background-repeat:no-repeat; -background-position:right; -padding-right:20px; -height:20px; -margin-left:30px; -} - -.breadcrumb{ -display: block; -position: relative; -top:-20px; -/*border-top:2px solid #ffffff;*/ -border-bottom: 1px solid #cecece; -background-color:#F2F2F2; -z-index:1; -height:20px; -padding:0px; -margin:0px; -padding-left:10px; -padding-top:2px; -margin-left:-5px; -margin-right:-5px; -} - -.breadcrumb ul{ - margin:0px; - padding:0px; -} - -.breadcrumb ul li{ -background-color:#F2F2F2; -list-style-type:none; -padding:0; -margin:0; -height:20px; -} - -.breadcrumb li{ -float:left; -} - -.breadcrumb .first { -background:url(../images/home.png); -background-position:left; -background-repeat:no-repeat; -padding-left:20px; -} - - -.breadcrumb li a{ -color:#2C418D; -display:block; -text-decoration:none; -background:url(../images/arrow.png); -background-repeat:no-repeat; -background-position:right; -padding-right:25px; -padding-left:10px; -} - -.breadcrumb li a:hover{ -color:#909090; -display:block; -text-decoration:none; -background:url(../images/arrow.png); -background-repeat:no-repeat; -background-position:right; -padding-right:20px; -padding-left:10px; -} - - -/* table of content -no display -*/ - -/* ------------ -headers ------------ -*/ - - -@media screen{ -.title{ -color:#313131; -font-size: 18px; -font-weight: normal; -left: 0; -padding-bottom: 20px; -padding-left: 10px; -padding-top: 20px; -position: absolute; -right: 0; -top: 0; -background-color:#E6E6E6; -border-bottom: 1px #CCC solid; -border-top: 2px #CCC solid; -font-weight:bold; -margin-left:0px; -margin-right:0px; -} -} - -h1 { -margin: 0; -} - -h2, p.h2 { -font: 500 16px/1.2 Arial; -font-weight:100; -background-color:#F2F3F4; -padding:4px; -margin-bottom:30px; -margin-top:30px; -border-top:#E0E0DE 1px solid; -border-bottom: #E0E0DE 1px solid; -max-width: 99%; -} - -h3{ - -font: 500 14px/1.2 Arial; -font-weight:100; -text-decoration:underline; -margin-bottom:30px; -margin-top:30px; -} - -h3.fn,span.fn{ -border-width: 1px; -border-style: solid; -border-color: #E6E6E6; --moz-border-radius: 7px 7px 7px 7px; --webkit-border-radius: 7px 7px 7px 7px; -border-radius: 7px 7px 7px 7px; -background-color: #F6F6F6; -word-spacing: 3px; -padding: 5px 5px; -text-decoration:none; -font-weight:bold; -max-width:75%; -font-size:14px; -margin:0px; -margin-top:30px; - -} - -.name{ -color:#1A1A1A; -} -.type{ -color:#808080; -} - - - -@media print { -.title { -color:#0066CB; -font-family:Arial, Helvetica; -font-size: 32px; -font-weight: normal; -left: 0; -position: absolute; -right: 0; -top: 0; -} -} - - -/* ------------------ -table styles ------------------ -*/ -.table img { -border:none; -margin-left:0px; --moz-box-shadow:0px 0px 0px #fff; --webkit-box-shadow: 0px 0px 0px #fff; -box-shadow: 0px 0px 0px #fff; -} - -/* table with border alternative colours*/ - - table,pre{ --moz-border-radius: 7px 7px 7px 7px; --webkit-border-radius: 7px 7px 7px 7px; - border-radius: 7px 7px 7px 7px; -background-color: #F6F6F6; -border: 1px solid #E6E6E6; -border-collapse: separate; -font-size: 12px; -line-height: 1.2; -margin-bottom: 25px; -margin-left: 15px; -font-size: 12px; -line-height: 1.2; -margin-bottom: 25px; -margin-left: 15px; -} - - -table th{ -text-align:left; -padding-left:20px; -} - -table td { -padding: 3px 15px 3px 20px; -border-bottom:#CCC dotted 1px; -} -table p { margin:0px;} - -table tr.even { -background-color: white; -color: #66666E; -} - -table tr.odd { -background-color: #F6F6F6; -color: #66666E; -} - - -table thead { -text-align:left; -padding-left:20px; -background-color:#e1e0e0; -border-left:none; -border-right:none; -} - -table thead th { -padding-top:5px; -padding-left:10px; -padding-bottom:5px; -border-bottom: 2px solid #D1D1D1; -padding-right:10px; -} - - -/* table bodless & white*/ - -.borderless { -border-radius: 0px 0px 0px 0px; -background-color: #fff; -border: 1px solid #fff; -} - -.borderless tr { -background-color: #FFF; -color: #66666E; -} - -.borderless td { -border:none; -border-bottom:#fff dotted 1px; -} - -/* ------------ -List ------------ -*/ - -ul{ -padding-bottom:2px; -} - -li { -margin-bottom: 10px; -padding-left: 8px; -list-style:outside; -list-style-type:square; -text-align:left; -} - - -ol{ -margin:10px; -padding:0; -} - -ol > li{ -margin-left: 30px; -padding-left:8px; -list-style:decimal; -} - -.centerAlign{ -text-align: left; -} - -.cpp{ -display: block; -margin: 10; -overflow: hidden; -overflow-x: hidden; -overflow-y: hidden; -padding: 20px 0 20px 0; -} - -.footer{ -margin-top: 50px; -padding-left:5px; -margin-bottom: 10px; -font-size:10px; -border-top: 1px solid #999; -padding-top:11px; -} - -.footerNavi{ -width:auto; -text-align:right; -margin-top:50px; -z-index:1; -} - -.memItemLeft{ -padding-right: 3px; -} - -.memItemRight{ -padding: 3px 15px 3px 0; -} - -.qml{ -display: block; -margin: 10; -overflow: hidden; -overflow-x: hidden; -overflow-y: hidden; -padding: 20px 0 20px 0; -} - -.qmldefault{ -padding-left: 5px; -float: right; -color: red; -} - -.qmlreadonly{ -padding-left: 5px; -float: right; -color: #254117; -} - -.rightAlign{ -padding: 3px 5px 3px 10px; -text-align: right; -} - -/* ------------ -Content table ------------ -*/ - -@media print{ -.toc { -float: right; -padding-bottom: 10px; -padding-top: 50px; -width: 100%; -background-image:url(../images/bgrContent.png); -background-position:top; -background-repeat:no-repeat; -} -} - -@media screen{ -.toc{ -clear:both; -float:right; -vertical-align:top; --moz-border-radius: 7px 7px 7px 7px; --webkit-border-radius: 7px 7px 7px 7px; -border-radius: 7px 7px 7px 7px; - background:#FFF url(../images/bgrContent.png); -background-position:top; -background-repeat:repeat-x; -border: 1px solid #E6E6E6; -padding-left:5px; -padding-bottom:10px; -height: auto; -width: 200px; -text-align:left; -z-index:2; -margin-left:20px; -margin-right:20px; -margin-top:0px; -padding-top:0px; -} -} - -.toc h3{ -text-decoration:none; -} - -.toc h3{font: 500 14px/1.2 Arial; -font-weight:100; -padding:0px; -margin:0px; -padding-top:5px; -padding-left:5px; -} - - -.toc ul{ -width:160px; -padding-left:10px; -padding-right:5px; -padding-bottom:10px; -padding-top:10px; -} - -.toc ul li{ -margin-left:20px; -list-style-image:url(../images/blu_dot.png); -list-style:outside; - -} - - -.toc ul li a:link{ -color: #2C418D; -text-decoration: none; -} - -.toc ul li a:hover{ -color: #869CD1; -text-decoration:underline; - -} - -.toc ul li a:visited{ -color: #869CD1; -font-weight: bold; -} - -.level1{ -border:none;} - -.clearfix{ -clear:both;} - diff --git a/examples/svg/svggenerator/doc/src/svggenerator.qdoc b/examples/svg/svggenerator/doc/src/svggenerator.qdoc index 9fa13fb..89ac9d5 100644 --- a/examples/svg/svggenerator/doc/src/svggenerator.qdoc +++ b/examples/svg/svggenerator/doc/src/svggenerator.qdoc @@ -117,6 +117,6 @@ application, and can be used to show the contents of SVG files created by this example. - See the QtSvg module documentation for more information about SVG and Qt's + See the Qt SVG module documentation for more information about SVG and Qt's SVG classes. */ diff --git a/examples/svg/svgviewer/doc/src/svgviewer.qdoc b/examples/svg/svgviewer/doc/src/svgviewer.qdoc index 5ced883..b1da95d 100644 --- a/examples/svg/svgviewer/doc/src/svgviewer.qdoc +++ b/examples/svg/svgviewer/doc/src/svgviewer.qdoc @@ -42,5 +42,5 @@ a QImage. This allows testing of drawing accuracy and performance for both the native, raster, and OpenGL paint engines. - See the QtSvg module documentation for more information about SVG and Qt's SVG classes. + See the Qt SVG module documentation for more information about SVG and Qt's SVG classes. */ 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 diff --git a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt index ba5545a..85f36ab 100644 --- a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0xb422e5dc) 0 QObject (0xb4022508) 0 primary-for QObjectCleanupHandler (0xb422e5dc) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4022a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg b/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg index 7799b7f..1e78e17 100644 --- a/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg +++ b/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"> -<title>Qt Svg Document</title> +<title>Qt SVG Document</title> <desc>Generated with Qt</desc> <defs> </defs> diff --git a/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg b/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg index eee8b6e..2c5c03e 100644 --- a/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg +++ b/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="70.5556mm" height="35.2778mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"> -<title>Qt Svg Document</title> +<title>Qt SVG Document</title> <desc>Generated with Qt</desc> <defs> <radialGradient gradientUnits="objectBoundingBox" cx="0.5" cy="0.5" r="0.5" fx="0.5" fy="0.5" xml:id="gradient1"> |
