diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-22 00:30:47 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-04 18:49:27 +0100 |
commit | 768bf08a1ff3eed8b9367fa3d4a34ea987425af7 (patch) | |
tree | 7e18c562f1cb9ff1e3890ec9ff8e6efc8b862e6b /src | |
parent | a1ebb0367d8dd02ead0abe4ab9a82c379428666d (diff) |
Silence the Clang warning about overloaded virtual shadowing a previous
There are a couple virtuals that are being overridden intentionally. We
can't raise the previous virtual because they are privates. So the only
thing we can do is disable the warning.
Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/util/qdeclarativeanimation_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index bf3019de..2c09235b 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -61,6 +61,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && \ + (defined(Q_CC_CLANG) || (__GNUC__ * 100 + __GNUC_MINOR__) > 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif + class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus @@ -507,6 +513,11 @@ protected: virtual QAbstractAnimation *qtAnimation(); }; +#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && \ + (defined(Q_CC_CLANG) || (__GNUC__ * 100 + __GNUC_MINOR__) > 406) +# pragma GCC diagnostic pop +#endif + QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeAbstractAnimation) |