Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

4 files changed, 7 insertions, 7 deletions

diff --git a/examples/widgets/widgets/calculator/button.cpp b/examples/widgets/widgets/calculator/button.cpp
index 0d622b1781..a1ce0bf428 100644
--- a/examples/widgets/widgets/calculator/button.cpp
+++ b/examples/widgets/widgets/calculator/button.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "button.h"
 
+#include <QtWidgets>
+
 //! [0]
 Button::Button(const QString &text, QWidget *parent)
     : QToolButton(parent)
diff --git a/examples/widgets/widgets/calculator/button.h b/examples/widgets/widgets/calculator/button.h
index 057640700f..7c6f26867f 100644
--- a/examples/widgets/widgets/calculator/button.h
+++ b/examples/widgets/widgets/calculator/button.h
@@ -59,7 +59,7 @@ class Button : public QToolButton
     Q_OBJECT
 
 public:
-    explicit Button(const QString &text, QWidget *parent = 0);
+    explicit Button(const QString &text, QWidget *parent = nullptr);
 
     QSize sizeHint() const override;
 };
diff --git a/examples/widgets/widgets/calculator/calculator.cpp b/examples/widgets/widgets/calculator/calculator.cpp
index cbcc29b2a8..dd908cf40a 100644
--- a/examples/widgets/widgets/calculator/calculator.cpp
+++ b/examples/widgets/widgets/calculator/calculator.cpp
@@ -48,13 +48,13 @@
 **
 ****************************************************************************/
 
+#include "button.h"
+#include "calculator.h"
+
 #include <QtWidgets>
 
 #include <cmath>
 
-#include "button.h"
-#include "calculator.h"
-
 //! [0]
 Calculator::Calculator(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/calculator/calculator.h b/examples/widgets/widgets/calculator/calculator.h
index 6d7e336347..937de185e7 100644
--- a/examples/widgets/widgets/calculator/calculator.h
+++ b/examples/widgets/widgets/calculator/calculator.h
@@ -64,7 +64,7 @@ class Calculator : public QWidget
     Q_OBJECT
 
 public:
-    Calculator(QWidget *parent = 0);
+    Calculator(QWidget *parent = nullptr);
 
 private slots:
     void digitClicked();