From 2af7e73f7e0335d28bb3de7c985a7305aba36a5e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Oct 2013 21:14:24 +0200 Subject: remove pointless #ifndef QT_NO_SVG the way to disable the feature is to not compile the module. Change-Id: I96f18d037243f7d6e3b3cb2c23922cc4c05c30a8 Reviewed-by: Joerg Bornemann --- src/plugins/iconengines/svgiconengine/main.cpp | 2 +- src/plugins/iconengines/svgiconengine/qsvgiconengine.h | 3 --- src/svg/qsvgfont.cpp | 4 ---- src/svg/qsvgfont_p.h | 4 ---- src/svg/qsvggraphics.cpp | 4 ---- src/svg/qsvggraphics_p.h | 3 --- src/svg/qsvghandler.cpp | 4 ---- src/svg/qsvghandler_p.h | 4 ---- src/svg/qsvgnode.cpp | 4 ---- src/svg/qsvgnode_p.h | 3 --- src/svg/qsvgstructure.cpp | 4 ---- src/svg/qsvgstructure_p.h | 3 --- src/svg/qsvgstyle.cpp | 4 ---- src/svg/qsvgstyle_p.h | 4 ---- src/svg/qsvgtinydocument.cpp | 4 ---- src/svg/qsvgtinydocument_p.h | 3 --- 16 files changed, 1 insertion(+), 56 deletions(-) diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp index 2fd9d57..c16cf95 100644 --- a/src/plugins/iconengines/svgiconengine/main.cpp +++ b/src/plugins/iconengines/svgiconengine/main.cpp @@ -42,7 +42,7 @@ #include #include -#if !defined(QT_NO_IMAGEFORMATPLUGIN) && !defined(QT_NO_SVG) +#if !defined(QT_NO_IMAGEFORMATPLUGIN) #include "qsvgiconengine.h" diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h index 8f9a1c3..ebf5314 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h @@ -45,8 +45,6 @@ #include #include -#ifndef QT_NO_SVG - QT_BEGIN_NAMESPACE class QSvgIconEnginePrivate; @@ -80,5 +78,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif diff --git a/src/svg/qsvgfont.cpp b/src/svg/qsvgfont.cpp index cc74793..c4af0d7 100644 --- a/src/svg/qsvgfont.cpp +++ b/src/svg/qsvgfont.cpp @@ -41,8 +41,6 @@ #include "qsvgfont_p.h" -#ifndef QT_NO_SVG - #include "qpainter.h" #include "qpen.h" #include "qdebug.h" @@ -138,5 +136,3 @@ void QSvgFont::setUnitsPerEm(qreal upem) } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index 6291888..1458c36 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -54,9 +54,6 @@ // #include "qpainterpath.h" - -#ifndef QT_NO_SVG - #include "qhash.h" #include "qstring.h" #include "qsvgstyle_p.h" @@ -99,5 +96,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGFONT_P_H diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index b8ee7ba..e0adb2d 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -41,8 +41,6 @@ #include "qsvggraphics_p.h" -#ifndef QT_NO_SVG - #include "qsvgfont_p.h" #include "qpainter.h" @@ -611,5 +609,3 @@ QRectF QSvgLine::bounds(QPainter *p, QSvgExtraStates &) const } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index b881a4d..ed5e4cb 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.h @@ -55,8 +55,6 @@ #include "qsvgnode_p.h" -#ifndef QT_NO_SVG - #include "QtGui/qpainterpath.h" #include "QtGui/qimage.h" #include "QtGui/qtextlayout.h" @@ -258,5 +256,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGGRAPHICS_P_H diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 63bdd24..614290b 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -43,8 +43,6 @@ #include "qsvghandler_p.h" -#ifndef QT_NO_SVG - #include "qsvgtinydocument_p.h" #include "qsvgstructure_p.h" #include "qsvggraphics_p.h" @@ -3956,5 +3954,3 @@ QSvgHandler::~QSvgHandler() } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvghandler_p.h b/src/svg/qsvghandler_p.h index 0bb830c..d7311d0 100644 --- a/src/svg/qsvghandler_p.h +++ b/src/svg/qsvghandler_p.h @@ -54,9 +54,6 @@ // #include "QtCore/qxmlstream.h" - -#ifndef QT_NO_SVG - #include "QtCore/qhash.h" #include "QtCore/qstack.h" #include "qsvgstyle_p.h" @@ -192,5 +189,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGHANDLER_P_H diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index f082502..906d7ea 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.cpp @@ -42,8 +42,6 @@ #include "qsvgnode_p.h" #include "qsvgtinydocument_p.h" -#ifndef QT_NO_SVG - #include "qdebug.h" #include "qstack.h" @@ -341,5 +339,3 @@ qreal QSvgNode::strokeWidth(QPainter *p) } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvgnode_p.h b/src/svg/qsvgnode_p.h index 3606895..a3ea3b0 100644 --- a/src/svg/qsvgnode_p.h +++ b/src/svg/qsvgnode_p.h @@ -55,8 +55,6 @@ #include "qsvgstyle_p.h" -#ifndef QT_NO_SVG - #include "QtCore/qstring.h" #include "QtCore/qhash.h" @@ -202,5 +200,4 @@ inline QString QSvgNode::xmlClass() const QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGNODE_P_H diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index 0b46535..1ae881e 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -41,8 +41,6 @@ #include "qsvgstructure_p.h" -#ifndef QT_NO_SVG - #include "qsvgnode_p.h" #include "qsvgstyle_p.h" #include "qsvgtinydocument_p.h" @@ -379,5 +377,3 @@ QSvgNode * QSvgStructureNode::previousSiblingNode(QSvgNode *n) const } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvgstructure_p.h b/src/svg/qsvgstructure_p.h index 7203681..32d2972 100644 --- a/src/svg/qsvgstructure_p.h +++ b/src/svg/qsvgstructure_p.h @@ -55,8 +55,6 @@ #include "qsvgnode_p.h" -#ifndef QT_NO_SVG - #include "QtCore/qlist.h" #include "QtCore/qhash.h" @@ -114,5 +112,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGSTRUCTURE_P_H diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 243ed0d..4385291 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -41,8 +41,6 @@ #include "qsvgstyle_p.h" -#ifndef QT_NO_SVG - #include "qsvgfont_p.h" #include "qsvggraphics_p.h" #include "qsvgnode_p.h" @@ -955,5 +953,3 @@ void QSvgGradientStyle::resolveStops() } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index fe6fb69..132234b 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -54,9 +54,6 @@ // #include "QtGui/qpainter.h" - -#ifndef QT_NO_SVG - #include "QtGui/qpen.h" #include "QtGui/qbrush.h" #include "QtGui/qmatrix.h" @@ -822,5 +819,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGSTYLE_P_H diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index 79537d3..2d1b1bd 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -41,8 +41,6 @@ #include "qsvgtinydocument_p.h" -#ifndef QT_NO_SVG - #include "qsvghandler_p.h" #include "qsvgfont_p.h" @@ -488,5 +486,3 @@ void QSvgTinyDocument::setFramesPerSecond(int num) } QT_END_NAMESPACE - -#endif // QT_NO_SVG diff --git a/src/svg/qsvgtinydocument_p.h b/src/svg/qsvgtinydocument_p.h index 8f8daf4..b572033 100644 --- a/src/svg/qsvgtinydocument_p.h +++ b/src/svg/qsvgtinydocument_p.h @@ -56,8 +56,6 @@ #include "qsvgstructure_p.h" #include "qtsvgglobal.h" -#ifndef QT_NO_SVG - #include "QtCore/qrect.h" #include "QtCore/qlist.h" #include "QtCore/qhash.h" @@ -197,5 +195,4 @@ inline int QSvgTinyDocument::animationDuration() const QT_END_NAMESPACE -#endif // QT_NO_SVG #endif // QSVGTINYDOCUMENT_P_H -- cgit v1.2.1 From 3bf41ceaec7f115d8f6f10d3fdf20d81bde6dafe Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 5 Nov 2013 13:35:25 +0100 Subject: Doc: Updated url variable in qdocconf files. In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Idde504f1ba9d6b5c2b62d31500a19ecc797af94d Reviewed-by: Leena Miettinen Reviewed-by: Venugopal Shivashankar --- src/svg/doc/qtsvg.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index 53151de..78c379e 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtSvg description = Qt SVG Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtsvg +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION qhp.projects = QtSvg -- cgit v1.2.1 From b719b93770393bbf20251e1dffc70498061e612c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 8 Nov 2013 09:36:55 +0100 Subject: Android: Make libQt5Xml.so a default dependency of Qt Svg When we depend on Qt Svg, we probably also want to be able to use the image formats plugin, which also depends on Qt Xml. To make this possible, we add a default dependency on libQt5Xml. Task-number: QTBUG-34586 Change-Id: I59fa54eabb2e4f71d6b89cc1b04b36b704154a9b Reviewed-by: Christian Stromme --- src/svg/svg.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 5527fa1..983fefe 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -53,3 +53,9 @@ contains(QT_CONFIG, system-zlib) { else: \ INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib } + +ANDROID_LIB_DEPENDENCIES = \ + lib/libQt5Xml.so + +ANDROID_BUNDLED_FILES += \ + lib/libQt5Xml.so -- cgit v1.2.1