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>

diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h
index f7d69be..4fb4c95 100644 (file)
--- 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 3fd9dbe..eb3c000 100644 (file)
--- 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();