Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28

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;