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/scripttools | |
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/scripttools')
-rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.h | 6 | ||||
-rw-r--r-- | src/scripttools/scripttools.pro | 4 |
2 files changed, 5 insertions, 5 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; 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) |