From 36a22f2c48f7df34c71b2177ff9c8b65daef614c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:46:17 +0100 Subject: consistently put {qt,qml}_{module,plugin} at the end of project files this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I20b0d2c018e3adce10629aee3fa055df437df71c Reviewed-by: Joerg Bornemann --- src/plugins/iconengines/svgiconengine/svgiconengine.pro | 10 +++++----- src/plugins/imageformats/svg/svg.pro | 10 +++++----- src/svg/svg.pro | 3 ++- 3 files changed, 12 insertions(+), 11 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/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) -- cgit v1.2.1 From a0363376cfbfd9359adbd2501dd087dfb0a4eb98 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Mar 2016 13:59:24 +0100 Subject: Make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: I725682ffe00dab94f84b00eed3aa76377bb80519 Reviewed-by: Lars Knoll --- src/svg/qgraphicssvgitem.h | 6 +++--- src/svg/qsvgrenderer.h | 8 ++++---- src/svg/qsvgwidget.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 541ddec..f3410d7 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -55,8 +55,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; @@ -74,7 +74,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 7d29e6d..612b10d 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -59,10 +59,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 86616e1..3b8c26a 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -53,8 +53,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; -- cgit v1.2.1