diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 14:10:43 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-07 09:05:04 +0000 |
| commit | a6fe61915ef46b300975faa394736344046e600c (patch) | |
| tree | 1898674607e1e8b7a37073477447478051f8a2a1 /src/declarative/qml/qdeclarativeexpression.h | |
| parent | 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141 (diff) | |
| download | qtquick1-a6fe61915ef46b300975faa394736344046e600c.tar.gz | |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6
Task-number: QTBUG-45291
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index 61ef3b70..978bdf83 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject Q_OBJECT public: QDeclarativeExpression(); - QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = 0); + QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = Q_NULLPTR); virtual ~QDeclarativeExpression(); QDeclarativeEngine *engine() const; @@ -77,7 +77,7 @@ public: void clearError(); QDeclarativeError error() const; - QVariant evaluate(bool *valueIsUndefined = 0); + QVariant evaluate(bool *valueIsUndefined = Q_NULLPTR); Q_SIGNALS: void valueChanged(); |