Commit 984efb1e authored by Kai Koehne's avatar Kai Koehne
Browse files

MultipleInheritance: Improve code and documentation


Task-number: QTBUG-61419
Change-Id: I858027db3ca83a4fe41a576919acbb408db35cff
GPush-Base: 8abb03b0d84a3a94f7db41e010f69955488ea893
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
parent b549cd91
Branches
Tags
No related merge requests found
Showing with 8 additions and 7 deletions
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the examples of the Qt Toolkit. ** This file is part of the examples of the Qt Toolkit.
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtWidgets>
#include "calculatorform.h" #include "calculatorform.h"
#include <QWidget>
//! [0] //! [0]
......
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the examples of the Qt Toolkit. ** This file is part of the examples of the Qt Toolkit.
...@@ -61,7 +61,7 @@ class CalculatorForm : public QWidget, private Ui::CalculatorForm ...@@ -61,7 +61,7 @@ class CalculatorForm : public QWidget, private Ui::CalculatorForm
Q_OBJECT Q_OBJECT
public: public:
CalculatorForm(QWidget *parent = 0); explicit CalculatorForm(QWidget *parent = nullptr);
private slots: private slots:
void on_inputSpinBox1_valueChanged(int value); void on_inputSpinBox1_valueChanged(int value);
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QApplication>
#include "calculatorform.h" #include "calculatorform.h"
#include <QApplication>
//! [0] //! [0]
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
#! [0] #! [0]
SOURCES = calculatorform.cpp main.cpp QT += widgets
HEADERS = calculatorform.h HEADERS = calculatorform.h
SOURCES = calculatorform.cpp main.cpp
FORMS = calculatorform.ui FORMS = calculatorform.ui
#! [0] #! [0]
target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
INSTALLS += target INSTALLS += target
QT += widgets
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment