diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:26 +0200 |
| commit | 6f00d966b8f1f12e4c41cf0a3e189718d10fd43f (patch) | |
| tree | e519fab9eb981fe4d4fd286b2d85f230de43ae7f /src/script/api/qscriptextensionplugin.h | |
| parent | 7c0a9bbc1ca4158b7e713bf2bf570e45b7d98823 (diff) | |
| parent | b49bfdaad11be1de632f907d43485a7ac701ddc5 (diff) | |
| download | qtscript-6f00d966b8f1f12e4c41cf0a3e189718d10fd43f.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ib083ce598299f883ce0dac7f79c1da2d6f0321ec
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; |