summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:57 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:57 +0100
commit86b82a0eea6c26fba34a9d2049935a18a088f3e7 (patch)
treecfb16979ac42ca43d35a0687a77b325510674308 /src
parent4ef60892ce9e8dea75a31b0be7895ebf473346a9 (diff)
parenta0363376cfbfd9359adbd2501dd087dfb0a4eb98 (diff)
downloadqtsvg-86b82a0eea6c26fba34a9d2049935a18a088f3e7.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I690e64f28de8d7a7768213f89858d3c19246fa08
Diffstat (limited to 'src')
-rw-r--r--src/plugins/iconengines/svgiconengine/svgiconengine.pro10
-rw-r--r--src/plugins/imageformats/svg/svg.pro10
-rw-r--r--src/svg/qgraphicssvgitem.h6
-rw-r--r--src/svg/qsvgrenderer.h8
-rw-r--r--src/svg/qsvgwidget.h4
-rw-r--r--src/svg/svg.pro3
6 files changed, 21 insertions, 20 deletions
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index 516142b..eb6847b 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -1,12 +1,12 @@
TARGET = qsvgicon
-PLUGIN_TYPE = iconengines
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgIconPlugin
-load(qt_plugin)
-
HEADERS += qsvgiconengine.h
SOURCES += main.cpp \
qsvgiconengine.cpp
OTHER_FILES += qsvgiconengine.json
QT += svg core-private gui-private
+
+PLUGIN_TYPE = iconengines
+PLUGIN_EXTENDS = svg
+PLUGIN_CLASS_NAME = QSvgIconPlugin
+load(qt_plugin)
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
index ce1881f..9db6a9a 100644
--- a/src/plugins/imageformats/svg/svg.pro
+++ b/src/plugins/imageformats/svg/svg.pro
@@ -1,11 +1,11 @@
TARGET = qsvg
-PLUGIN_TYPE = imageformats
-PLUGIN_EXTENDS = svg
-PLUGIN_CLASS_NAME = QSvgPlugin
-load(qt_plugin)
-
HEADERS += qsvgiohandler.h
SOURCES += main.cpp \
qsvgiohandler.cpp
QT += svg
+
+PLUGIN_TYPE = imageformats
+PLUGIN_EXTENDS = svg
+PLUGIN_CLASS_NAME = QSvgPlugin
+load(qt_plugin)
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 90ae4c5..88603ec 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -61,8 +61,8 @@ class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject
Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize)
public:
- QGraphicsSvgItem(QGraphicsItem *parentItem=0);
- QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem=0);
+ QGraphicsSvgItem(QGraphicsItem *parentItem = Q_NULLPTR);
+ QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR);
void setSharedRenderer(QSvgRenderer *renderer);
QSvgRenderer *renderer() const;
@@ -80,7 +80,7 @@ public:
virtual void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
- QWidget *widget=0);
+ QWidget *widget = Q_NULLPTR);
enum { Type = 13 };
virtual int type() const;
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index fe58343..6538df0 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -65,10 +65,10 @@ class Q_SVG_EXPORT QSvgRenderer : public QObject
Q_PROPERTY(int framesPerSecond READ framesPerSecond WRITE setFramesPerSecond)
Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame)
public:
- QSvgRenderer(QObject *parent=0);
- QSvgRenderer(const QString &filename, QObject *parent=0);
- QSvgRenderer(const QByteArray &contents, QObject *parent=0);
- QSvgRenderer(QXmlStreamReader *contents, QObject *parent=0);
+ QSvgRenderer(QObject *parent = Q_NULLPTR);
+ QSvgRenderer(const QString &filename, QObject *parent = Q_NULLPTR);
+ QSvgRenderer(const QByteArray &contents, QObject *parent = Q_NULLPTR);
+ QSvgRenderer(QXmlStreamReader *contents, QObject *parent = Q_NULLPTR);
~QSvgRenderer();
bool isValid() const;
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 3f5210e..d936c6b 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -59,8 +59,8 @@ class Q_SVG_EXPORT QSvgWidget : public QWidget
{
Q_OBJECT
public:
- QSvgWidget(QWidget *parent=0);
- QSvgWidget(const QString &file, QWidget *parent=0);
+ QSvgWidget(QWidget *parent = Q_NULLPTR);
+ QSvgWidget(const QString &file, QWidget *parent = Q_NULLPTR);
~QSvgWidget();
QSvgRenderer *renderer() const;
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 83e76b7..103bbea 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -7,7 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_DOCS = $$PWD/doc/qtsvg.qdocconf
-load(qt_module)
HEADERS += \
qsvggraphics_p.h \
@@ -53,3 +52,5 @@ contains(QT_CONFIG, system-zlib) {
} else {
QT_PRIVATE += zlib-private
}
+
+load(qt_module)