diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:46 +0100 |
commit | a775b9da4794f1f248b63a4a58ee6ad6885f0622 (patch) | |
tree | 55f42013d9feb858b53134978141a61e81539f02 /src/script/api/qscriptextensionplugin.h | |
parent | 0af88dc973d3410cdd905265ce935916693b2d44 (diff) | |
parent | f5e16ab0e1e153ec86f0d8651571e176ac6caa7c (diff) | |
download | qtscript-a775b9da4794f1f248b63a4a58ee6ad6885f0622.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28
Diffstat (limited to 'src/script/api/qscriptextensionplugin.h')
-rw-r--r-- | src/script/api/qscriptextensionplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |