summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:46 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:46 +0100
commita775b9da4794f1f248b63a4a58ee6ad6885f0622 (patch)
tree55f42013d9feb858b53134978141a61e81539f02
parent0af88dc973d3410cdd905265ce935916693b2d44 (diff)
parentf5e16ab0e1e153ec86f0d8651571e176ac6caa7c (diff)
downloadqtscript-a775b9da4794f1f248b63a4a58ee6ad6885f0622.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28
-rw-r--r--src/plugins/script/qtdbus/qtdbus.pro8
-rw-r--r--src/script/api/qscriptengine.h6
-rw-r--r--src/script/api/qscriptextensionplugin.h2
-rw-r--r--src/script/api/qscriptstring.h2
-rw-r--r--src/script/script.pro4
-rw-r--r--src/scripttools/debugging/qscriptenginedebugger.h6
-rw-r--r--src/scripttools/scripttools.pro4
7 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro
index e37bf26..1b06f27 100644
--- a/src/plugins/script/qtdbus/qtdbus.pro
+++ b/src/plugins/script/qtdbus/qtdbus.pro
@@ -1,11 +1,11 @@
TARGET = qtscriptdbus
-PLUGIN_TYPE = script
-PLUGIN_CLASS_NAME = QtDBusScriptPlugin
-load(qt_plugin)
-
QT = core gui script
CONFIG += qdbus
SOURCES += main.cpp
HEADERS += main.h
+
+PLUGIN_TYPE = script
+PLUGIN_CLASS_NAME = QtDBusScriptPlugin
+load(qt_plugin)
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)
diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h
index 0286072..a56a833 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.h
+++ b/src/scripttools/debugging/qscriptenginedebugger.h
@@ -89,7 +89,7 @@ public:
SuspendedState
};
- QScriptEngineDebugger(QObject *parent = 0);
+ explicit QScriptEngineDebugger(QObject *parent = Q_NULLPTR);
~QScriptEngineDebugger();
void attachTo(QScriptEngine *engine);
@@ -101,8 +101,8 @@ public:
#ifndef QT_NO_MAINWINDOW
QMainWindow *standardWindow() const;
#endif
- QToolBar *createStandardToolBar(QWidget *parent = 0);
- QMenu *createStandardMenu(QWidget *parent = 0);
+ QToolBar *createStandardToolBar(QWidget *parent = Q_NULLPTR);
+ QMenu *createStandardMenu(QWidget *parent = Q_NULLPTR);
QWidget *widget(DebuggerWidget widget) const;
QAction *action(DebuggerAction action) const;
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 9b786ec..fb4343a 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -10,6 +10,6 @@ DEFINES += QT_NO_USING_NAMESPACE
QMAKE_DOCS = $$PWD/doc/qtscripttools.qdocconf
-load(qt_module)
-
include(debugging/debugging.pri)
+
+load(qt_module)