4 files changed, 7 insertions, 7 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:
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index a31487a..8fd1618 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -39,7 +39,7 @@ class Q_SCRIPT_EXPORT QScriptExtensionPlugin : public QObject,
     Q_OBJECT
     Q_INTERFACES(QScriptExtensionInterface:QFactoryInterface)
 public:
-    explicit QScriptExtensionPlugin(QObject *parent = 0);
+    explicit QScriptExtensionPlugin(QObject *parent = Q_NULLPTR);
     ~QScriptExtensionPlugin();
 
     virtual QStringList keys() const = 0;
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index c4047f2..eed4a1e 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -47,7 +47,7 @@ public:
     bool operator==(const QScriptString &other) const;
     bool operator!=(const QScriptString &other) const;
 
-    quint32 toArrayIndex(bool *ok = 0) const;
+    quint32 toArrayIndex(bool *ok = Q_NULLPTR) const;
 
     QString toString() const;
     operator QString() const;
diff --git a/src/script/script.pro b/src/script/script.pro
index e48abac..dec4a4f 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -8,8 +8,6 @@ DEFINES   += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
 
 QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf
 
-load(qt_module)
-
 CONFIG += building-libs
 
 WEBKITDIR = $$PWD/../3rdparty/javascriptcore
@@ -76,3 +74,5 @@ integrity {
 }
 
 TR_EXCLUDE = $$WEBKITDIR/*
+
+load(qt_module)