diff --git a/examples/uitools/multipleinheritance/calculatorform.cpp b/examples/uitools/multipleinheritance/calculatorform.cpp index 041c78e45101f2474711a2794777c5187ebf4b56..73bbd4fe5f4790a7b16ea27c2dc44ded11056642 100644 --- a/examples/uitools/multipleinheritance/calculatorform.cpp +++ b/examples/uitools/multipleinheritance/calculatorform.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#include <QtWidgets> #include "calculatorform.h" +#include <QWidget> //! [0] diff --git a/examples/uitools/multipleinheritance/calculatorform.h b/examples/uitools/multipleinheritance/calculatorform.h index cb40e49188e970072664a97c85596af771c5ae5c..28a885c82ea4710675874a00404bfa02e3d4a414 100644 --- a/examples/uitools/multipleinheritance/calculatorform.h +++ b/examples/uitools/multipleinheritance/calculatorform.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -61,7 +61,7 @@ class CalculatorForm : public QWidget, private Ui::CalculatorForm Q_OBJECT public: - CalculatorForm(QWidget *parent = 0); + explicit CalculatorForm(QWidget *parent = nullptr); private slots: void on_inputSpinBox1_valueChanged(int value); diff --git a/examples/uitools/multipleinheritance/main.cpp b/examples/uitools/multipleinheritance/main.cpp index 9e85ae479a4b992b6c547f38ed35f863e7cf3297..4a6c600c8d7add874f3e545fa01603b988680d02 100644 --- a/examples/uitools/multipleinheritance/main.cpp +++ b/examples/uitools/multipleinheritance/main.cpp @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#include <QApplication> #include "calculatorform.h" +#include <QApplication> //! [0] int main(int argc, char *argv[]) diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index 1baace29c8a02c2bd27cc9634a38da588797c2d4..fd40982ed64e7a1eb6eacd57f148553844b5314f 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -1,10 +1,11 @@ #! [0] -SOURCES = calculatorform.cpp main.cpp +QT += widgets + HEADERS = calculatorform.h +SOURCES = calculatorform.cpp main.cpp FORMS = calculatorform.ui #! [0] target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance INSTALLS += target -QT += widgets