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/scripttools/debugging/qscriptenginedebugger.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/scripttools/debugging/qscriptenginedebugger.h')
-rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |