diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2012-02-06 08:20:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 05:32:40 +0100 |
| commit | 0ca9d3f0f720e1933379ef40bc5c29253e21cba0 (patch) | |
| tree | 985aa27bae9acbb5ce4553ff5a7d5a981577ecc4 /src/quick/scenegraph | |
| parent | df9b5ed53f5a5e6bfe1354e3a7d890deb2405429 (diff) | |
Remove warnings with clang
Change-Id: I924f0adc036b47e2342bf383d308c6a5269c2de6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnodeupdater.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnodeupdater_p.h | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgcontextplugin_p.h | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 95c32c59f2..65c8df219f 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -83,6 +83,7 @@ public: }; QSGMaterialShader(); + virtual ~QSGMaterialShader() {}; virtual void activate(); virtual void deactivate(); diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp index b071bbb621..31b82d9d88 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp @@ -54,6 +54,10 @@ QSGNodeUpdater::QSGNodeUpdater() m_opacity_stack.add(1); } +QSGNodeUpdater::~QSGNodeUpdater() +{ +} + void QSGNodeUpdater::updateStates(QSGNode *n) { m_current_clip = 0; diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index c45412d201..5c455b8151 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -51,6 +51,7 @@ class Q_QUICK_EXPORT QSGNodeUpdater { public: QSGNodeUpdater(); + virtual ~QSGNodeUpdater(); virtual void updateStates(QSGNode *n); virtual bool isNodeBlocked(QSGNode *n, QSGNode *root) const; diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index e6bb2ea969..081e64ecdd 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -76,7 +76,7 @@ public: virtual QStringList keys() const = 0; virtual QSGContext *create(const QString &key) const = 0; - virtual QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &image) { return 0; } + virtual QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &) { return 0; } }; QT_END_NAMESPACE |