diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 12:55:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-10 10:30:14 +0000 |
| commit | 3772c3a3583b757439977ae8b13a3b9cfe5ba895 (patch) | |
| tree | 46d2e2ac23695c28ed4f1e4ad28a2d3f93171dbd /src | |
| parent | 28fdb955d48d8e7234e6302a4dfb436d671e60ce (diff) | |
| download | qttools-3772c3a3583b757439977ae8b13a3b9cfe5ba895.tar.gz | |
Move the uitools multipleinheritance example to calculatorform_mi
It illustrates how to use multipleinheritance from Ui struct and widget
and is not really related to UiTools.
Task-number: QTBUG-110447
Change-Id: If6b61c76ea0ac07b935f1e0a8ee02a2e7179cdc3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit db7a30bd1dca12b04f04a2617d54e22c61e5cf70)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/designer/src/designer/doc/src/designer-examples.qdoc | 1 | ||||
| -rw-r--r-- | src/designer/src/designer/doc/src/designer-manual.qdoc | 6 | ||||
| -rw-r--r-- | src/uitools/doc/src/qtuitools-examples.qdoc | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/designer/src/designer/doc/src/designer-examples.qdoc b/src/designer/src/designer/doc/src/designer-examples.qdoc index 98a597c5c..199c46db7 100644 --- a/src/designer/src/designer/doc/src/designer-examples.qdoc +++ b/src/designer/src/designer/doc/src/designer-examples.qdoc @@ -20,6 +20,7 @@ \li \l{arthurplugin}{Arthur Plugin} \li \l{calculatorbuilder}{Calculator Builder}\raisedaster \li \l{calculatorform}{Calculator Form}\raisedaster + \li \l{calculatorform_mi}{Calculator Form Example/Multiple Inheritance Example}\raisedaster \li \l{customwidgetplugin}{Custom Widget Plugin}\raisedaster \li \l{taskmenuextension}{Task Menu Extension}\raisedaster \li \l{containerextension}{Container Extension}\raisedaster diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc index 10ffa06d8..4cd7a819f 100644 --- a/src/designer/src/designer/doc/src/designer-manual.qdoc +++ b/src/designer/src/designer/doc/src/designer-manual.qdoc @@ -1931,14 +1931,14 @@ pixmap property in the property editor. We need to include the header file that \c uic generates from the \c calculatorform.ui file, as follows: - \snippet ../uitools/multipleinheritance/calculatorform.h 0 + \snippet ../designer/calculatorform_mi/calculatorform.h 0 The class is defined in a similar way to the one used in the \l{The Single Inheritance Approach}{single inheritance approach}, except that this time we inherit from \e{both} QWidget and \c{Ui::CalculatorForm}, as follows: - \snippet ../uitools/multipleinheritance/calculatorform.h 1 + \snippet ../designer/calculatorform_mi/calculatorform.h 1 We inherit \c{Ui::CalculatorForm} privately to ensure that the user interface objects are private in our subclass. We can also inherit it with @@ -1949,7 +1949,7 @@ pixmap property in the property editor. constructor used in the \l{The Single Inheritance Approach} {single inheritance} example: - \snippet ../uitools/multipleinheritance/calculatorform.cpp 0 + \snippet ../designer/calculatorform_mi/calculatorform.cpp 0 In this case, the widgets used in the user interface can be accessed in the same say as a widget created in code by hand. We no longer require the diff --git a/src/uitools/doc/src/qtuitools-examples.qdoc b/src/uitools/doc/src/qtuitools-examples.qdoc index 170bbcf42..90cf190e6 100644 --- a/src/uitools/doc/src/qtuitools-examples.qdoc +++ b/src/uitools/doc/src/qtuitools-examples.qdoc @@ -19,7 +19,6 @@ /* \list - \li \l{Multiple Inheritance Example}\raisedaster \li \l{Text Finder Example}\raisedaster \endlist |