diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:57 +0100 |
| commit | b8fd0ed3a47558b4ace480526cddffa51d6f0580 (patch) | |
| tree | 926095da42e111933bdb3a63c1a9e0a14fa4041f /src/qml/qml/qqmlengine.h | |
| parent | 669c554516736a6735b7286039c56cc0e8d56e05 (diff) | |
| parent | 443ba99b1ef825e198fe1999c34ee44547135797 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Icfa1d61fcc286c3418d4a625de11d2191336fa60
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index a7eda0ee6c..bd2a3cfc48 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -95,7 +95,7 @@ class Q_QML_EXPORT QQmlEngine : public QJSEngine Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath) Q_OBJECT public: - QQmlEngine(QObject *p = 0); + explicit QQmlEngine(QObject *p = Q_NULLPTR); virtual ~QQmlEngine(); QQmlContext *rootContext() const; |