diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-22 13:56:44 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 20:17:26 +0100 |
| commit | a496e0874858a4b7d991c179c0e12df46c3d324c (patch) | |
| tree | a343142c7addc7c3994b15922d60e940b2218f1d /src/qml | |
| parent | 523bf6c3d0076e43aee6747211f6e93005f2d1c6 (diff) | |
Fix warnings about shadowing members
util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow]
[and others]
Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421
Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/util/qqmlpropertymap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index cd3516a907..5c79f08926 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -83,8 +83,8 @@ protected: virtual QVariant updateValue(const QString &key, const QVariant &input); template<class DerivedType> - QQmlPropertyMap(DerivedType *derived, QObject *parent) - : QObject(*allocatePrivate(), parent) + QQmlPropertyMap(DerivedType *derived, QObject *parentObj) + : QObject(*allocatePrivate(), parentObj) { Q_UNUSED(derived) init(&DerivedType::staticMetaObject); |