Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28

1 files changed, 3 insertions, 3 deletions

diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index f7f8411..80a2869 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);
+    explicit QScriptEngine(QScriptEnginePrivate &dd, QObject *parent = Q_NULLPTR);
 #endif
 
 private: