aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcontext.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-03 10:45:35 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 11:41:39 +0000
commit0e0c351fff752ceadc99eef5fbcf5a180f453efc (patch)
treed722e7a29e7b7af9ecf8ceddf18a1efcc8d75d4e /src/qml/qml/qqmlcontext.h
parent8a99d2e11b1d4971faa489cef626b70a7d828d17 (diff)
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. Task-number: QTBUG-45291 Change-Id: Ied526fb2d7adc3a68946d6843a6bd6f475ebf864 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlcontext.h')
-rw-r--r--src/qml/qml/qqmlcontext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h
index e69a2f8f69..3049ec7f71 100644
--- a/src/qml/qml/qqmlcontext.h
+++ b/src/qml/qml/qqmlcontext.h
@@ -56,8 +56,8 @@ class Q_QML_EXPORT QQmlContext : public QObject
Q_DECLARE_PRIVATE(QQmlContext)
public:
- QQmlContext(QQmlEngine *parent, QObject *objParent=0);
- QQmlContext(QQmlContext *parent, QObject *objParent=0);
+ QQmlContext(QQmlEngine *parent, QObject *objParent = Q_NULLPTR);
+ QQmlContext(QQmlContext *parent, QObject *objParent = Q_NULLPTR);
virtual ~QQmlContext();
bool isValid() const;