diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:27 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-01 20:28:38 +0200 |
| commit | 64faeb0d8003e699a4d09e7dcee1ef6eb10302ad (patch) | |
| tree | 6dcbca91651e373e045181a82a8c8c2a380f8f8a /src/declarative/util/qdeclarativepropertymap.h | |
| parent | 92c847e56d94c9032f3fa83922742e455233e4f3 (diff) | |
| parent | 857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca (diff) | |
| download | qtquick1-64faeb0d8003e699a4d09e7dcee1ef6eb10302ad.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I39ab590ec2c95b3c213e90dad5a8f5e3e626baab
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; |