diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-27 11:33:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 04:23:45 +0200 |
| commit | d4919102b0794899f0e3067a95ae91b280e5115d (patch) | |
| tree | cae5fc3e5b22e3cac5e6c92593b7c2e80e48dc59 /src/qml/util | |
| parent | 9a8f869ef0c5a7cbd7b7b77cdbdff213176cf8d7 (diff) | |
Remove default parameter from protected QmlPropertyMap CT.
Make public constructor explicit.
This fixes QtLocation compilation (declarativeplaces defaulted
to the protected CT).
Change-Id: I8b32d7624b6ba770f6d646c227a0bfd37e501ee5
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
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 f7d69be7fb..4fb4c95a41 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -59,7 +59,7 @@ class Q_QML_EXPORT QQmlPropertyMap : public QObject { Q_OBJECT public: - QQmlPropertyMap(QObject *parent = 0); + explicit QQmlPropertyMap(QObject *parent = 0); virtual ~QQmlPropertyMap(); QVariant value(const QString &key) const; @@ -83,7 +83,7 @@ protected: virtual QVariant updateValue(const QString &key, const QVariant &input); template<class DerivedType> - QQmlPropertyMap(DerivedType *derived, QObject *parent = 0) + QQmlPropertyMap(DerivedType *derived, QObject *parent) : QObject(*allocatePrivate(), parent) { Q_UNUSED(derived) |