summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-06 12:20:49 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-06 12:22:33 +0000
commit0a29d74a5e875ad2e0229ed2c8e48344f87a45e0 (patch)
treecef7d55c367ee643f881d4f98051e3945f94b60d /src/script/api/qscriptengine.h
parent751c105984532f41de4c5f712f36f4c2579a60b7 (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. Change-Id: I7e007ee907c479320a885af329745563c080467d Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/script/api/qscriptengine.h')
-rw-r--r--src/script/api/qscriptengine.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index f7f8411..c9c0f7d 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -184,10 +184,10 @@ public:
#ifndef QT_NO_QOBJECT
QScriptValue newQObject(QObject *object, ValueOwnership ownership = QtOwnership,
- const QObjectWrapOptions &options = 0);
+ const QObjectWrapOptions &options = QObjectWrapOptions());
QScriptValue newQObject(const QScriptValue &scriptObject, QObject *qtObject,
ValueOwnership ownership = QtOwnership,
- const QObjectWrapOptions &options = 0);
+ const QObjectWrapOptions &options = QObjectWrapOptions());
QScriptValue newQMetaObject(const QMetaObject *metaObject, const QScriptValue &ctor = QScriptValue());
@@ -264,7 +264,7 @@ protected:
QScriptEngine(QScriptEnginePrivate &dd);
#else
- QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = 0);
+ QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = Q_NULLPTR);
#endif
private: