diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:48:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 14:50:02 +0200 |
| commit | ae2f2d2b92fbaa56d9557219a5696e700620f884 (patch) | |
| tree | 8fad3845aa9a746478479cbe7c02841a01ac4139 /src/declarative/util/qdeclarativepropertymap.h | |
| parent | 26229cfa0b729313893af5674d604e8692dbb946 (diff) | |
| parent | ed05a82cd52d2f84647ad1d46b242c619b2a14e3 (diff) | |
| download | qtquick1-ae2f2d2b92fbaa56d9557219a5696e700620f884.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
Diffstat (limited to 'src/declarative/util/qdeclarativepropertymap.h')
| -rw-r--r-- | src/declarative/util/qdeclarativepropertymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index 41073254..0ccf4ffc 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -49,7 +49,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject { Q_OBJECT public: - QDeclarativePropertyMap(QObject *parent = 0); + explicit QDeclarativePropertyMap(QObject *parent = Q_NULLPTR); virtual ~QDeclarativePropertyMap(); QVariant value(const QString &key) const; |