diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:57:50 +0100 |
| commit | 15dc45ce109fe41699950a9b87282901b21f2d3d (patch) | |
| tree | 809e79e7b55988006bb3d990168b2bb7eda360b5 /src/qml/util | |
| parent | cf53bf9ae6716613c120cc4a0202c69bd59eba1e (diff) | |
| parent | a496e0874858a4b7d991c179c0e12df46c3d324c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
Diffstat (limited to 'src/qml/util')
| -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 c327fd8ce4..f963e9074a 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -81,8 +81,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); |