diff options
| -rw-r--r-- | src/qml/util/qqmlpropertymap.h | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp | 2 |
2 files changed, 3 insertions, 3 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) diff --git a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp index 3fd9dbec8f..eb3c000c81 100644 --- a/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp +++ b/tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp @@ -285,7 +285,7 @@ class MyEnhancedPropertyMap : public QQmlPropertyMap { Q_OBJECT public: - MyEnhancedPropertyMap() : QQmlPropertyMap(this) {} + MyEnhancedPropertyMap() : QQmlPropertyMap(this, 0) {} signals: void testSignal(); |