Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

1 files changed, 3 insertions, 5 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/modal/base.h b/tests/auto/widgets/kernel/qapplication/modal/base.h
index 95eb427e61..153d9ca420 100644
--- a/tests/auto/widgets/kernel/qapplication/modal/base.h
+++ b/tests/auto/widgets/kernel/qapplication/modal/base.h
@@ -37,12 +37,10 @@ class base : public QWidget
 {
 Q_OBJECT
     QTimer *m_timer;
-    bool m_modalStarted;
-    QDialog *m_modalDialog;
+    bool m_modalStarted = false;
+    QDialog *m_modalDialog = nullptr;
 public:
-    explicit base(QWidget *parent = 0);
-
-signals:
+    explicit base(QWidget *parent = nullptr);
 
 public slots:
     void periodicTimer();