aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlapplicationengine.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:31:56 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:31:57 +0100
commitb8fd0ed3a47558b4ace480526cddffa51d6f0580 (patch)
tree926095da42e111933bdb3a63c1a9e0a14fa4041f /src/qml/qml/qqmlapplicationengine.h
parent669c554516736a6735b7286039c56cc0e8d56e05 (diff)
parent443ba99b1ef825e198fe1999c34ee44547135797 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/qml/qml/qqmlapplicationengine.h')
-rw-r--r--src/qml/qml/qqmlapplicationengine.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h
index 59667a1841..ff7dce5f8b 100644
--- a/src/qml/qml/qqmlapplicationengine.h
+++ b/src/qml/qml/qqmlapplicationengine.h
@@ -53,9 +53,9 @@ class Q_QML_EXPORT QQmlApplicationEngine : public QQmlEngine
{
Q_OBJECT
public:
- QQmlApplicationEngine(QObject *parent=0);
- QQmlApplicationEngine(const QUrl &url, QObject *parent=0);
- QQmlApplicationEngine(const QString &filePath, QObject *parent=0);
+ QQmlApplicationEngine(QObject *parent = Q_NULLPTR);
+ QQmlApplicationEngine(const QUrl &url, QObject *parent = Q_NULLPTR);
+ QQmlApplicationEngine(const QString &filePath, QObject *parent = Q_NULLPTR);
~QQmlApplicationEngine();
QList<QObject*> rootObjects();