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/qqmlexpression.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/qqmlexpression.h')
| -rw-r--r-- | src/qml/qml/qqmlexpression.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h index 0aff4884f9..5239d59c8a 100644 --- a/src/qml/qml/qqmlexpression.h +++ b/src/qml/qml/qqmlexpression.h @@ -60,8 +60,8 @@ class Q_QML_EXPORT QQmlExpression : public QObject Q_OBJECT public: QQmlExpression(); - QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = 0); - explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = 0, QObject * = 0, QObject * = 0); + QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = Q_NULLPTR); + explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = Q_NULLPTR, QObject * = Q_NULLPTR, QObject * = Q_NULLPTR); virtual ~QQmlExpression(); QQmlEngine *engine() const; @@ -84,7 +84,7 @@ public: void clearError(); QQmlError error() const; - QVariant evaluate(bool *valueIsUndefined = 0); + QVariant evaluate(bool *valueIsUndefined = Q_NULLPTR); Q_SIGNALS: void valueChanged(); |