diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-26 14:43:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-29 14:49:13 +0200 |
commit | 4b79834e1a88461eb0cd8d19125130ed973651fa (patch) | |
tree | dbdc17d9c9659514a68b72659dafb6f7b3448a27 | |
parent | 15db0935c546e0d63e6c391797754749490c9c2a (diff) |
Move MDI example to manual test
Pick-to: 6.5 6.6
Change-Id: Ide698a171a4600cb4bac6574b6be74c17f779051
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | examples/widgets/doc/src/mdi.qdoc | 14 | ||||
-rw-r--r-- | examples/widgets/mainwindows/CMakeLists.txt | 1 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mainwindows.pro | 1 | ||||
-rw-r--r-- | examples/widgets/tutorials/notepad/gettingstartedqt.qdoc | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 2 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/CMakeLists.txt (renamed from examples/widgets/mainwindows/mdi/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/copy.png (renamed from examples/widgets/mainwindows/mdi/images/copy.png) | bin | 1338 -> 1338 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/cut.png (renamed from examples/widgets/mainwindows/mdi/images/cut.png) | bin | 1323 -> 1323 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/new.png (renamed from examples/widgets/mainwindows/mdi/images/new.png) | bin | 852 -> 852 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/open.png (renamed from examples/widgets/mainwindows/mdi/images/open.png) | bin | 2073 -> 2073 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/paste.png (renamed from examples/widgets/mainwindows/mdi/images/paste.png) | bin | 1645 -> 1645 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/images/save.png (renamed from examples/widgets/mainwindows/mdi/images/save.png) | bin | 2699 -> 2699 bytes | |||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/main.cpp (renamed from examples/widgets/mainwindows/mdi/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mainwindow.cpp (renamed from examples/widgets/mainwindows/mdi/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mainwindow.h (renamed from examples/widgets/mainwindows/mdi/mainwindow.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mdi.pro (renamed from examples/widgets/mainwindows/mdi/mdi.pro) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mdi.qrc (renamed from examples/widgets/mainwindows/mdi/mdi.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mdichild.cpp (renamed from examples/widgets/mainwindows/mdi/mdichild.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/widgets/mainwindows/mdi/mdichild.h (renamed from examples/widgets/mainwindows/mdi/mdichild.h) | 0 |
20 files changed, 2 insertions, 22 deletions
diff --git a/examples/widgets/doc/src/mdi.qdoc b/examples/widgets/doc/src/mdi.qdoc deleted file mode 100644 index 23daeeb9bd..0000000000 --- a/examples/widgets/doc/src/mdi.qdoc +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example mainwindows/mdi - \title MDI Example - \ingroup examples-mainwindow - - \brief The MDI example shows how to implement a Multiple Document Interface using Qt's - QMdiArea class. - - \image mdi-example.png - -*/ diff --git a/examples/widgets/mainwindows/CMakeLists.txt b/examples/widgets/mainwindows/CMakeLists.txt index 3a96fbbdb3..78c2704366 100644 --- a/examples/widgets/mainwindows/CMakeLists.txt +++ b/examples/widgets/mainwindows/CMakeLists.txt @@ -2,5 +2,4 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_example(mainwindow) -qt_internal_add_example(mdi) qt_internal_add_example(menus) diff --git a/examples/widgets/mainwindows/mainwindows.pro b/examples/widgets/mainwindows/mainwindows.pro index 7ab042085f..7ed44f1817 100644 --- a/examples/widgets/mainwindows/mainwindows.pro +++ b/examples/widgets/mainwindows/mainwindows.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS = mainwindow \ - mdi \ menus diff --git a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc index 152bf8c114..d011cfd995 100644 --- a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc +++ b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc @@ -487,10 +487,6 @@ \li About \li Here \row - \li MDI applications - \li QMdiArea, - \l{MDI Example} - \row \li Files and I/O devices \li QFile, QIODevice \row diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 6b084cc31f..898d7760c8 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -11543,7 +11543,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level) its parent because other children of the parent might have been modified. - \sa windowTitle, {MDI Example} + \sa windowTitle */ bool QWidget::isWindowModified() const { diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 19ee3b7812..4262cba01f 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -281,7 +281,7 @@ void QMainWindowPrivate::init() of the toolbars and dock widgets that are stored. \sa QMenuBar, QToolBar, QStatusBar, QDockWidget, - {MDI Example}, {Menus Example} + {Menus Example} */ /*! diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/tests/manual/examples/widgets/mainwindows/mdi/CMakeLists.txt index 0af9873284..0af9873284 100644 --- a/examples/widgets/mainwindows/mdi/CMakeLists.txt +++ b/tests/manual/examples/widgets/mainwindows/mdi/CMakeLists.txt diff --git a/examples/widgets/mainwindows/mdi/images/copy.png b/tests/manual/examples/widgets/mainwindows/mdi/images/copy.png Binary files differindex 2aeb28288f..2aeb28288f 100644 --- a/examples/widgets/mainwindows/mdi/images/copy.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/copy.png diff --git a/examples/widgets/mainwindows/mdi/images/cut.png b/tests/manual/examples/widgets/mainwindows/mdi/images/cut.png Binary files differindex 54638e9386..54638e9386 100644 --- a/examples/widgets/mainwindows/mdi/images/cut.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/cut.png diff --git a/examples/widgets/mainwindows/mdi/images/new.png b/tests/manual/examples/widgets/mainwindows/mdi/images/new.png Binary files differindex 12131b0100..12131b0100 100644 --- a/examples/widgets/mainwindows/mdi/images/new.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/new.png diff --git a/examples/widgets/mainwindows/mdi/images/open.png b/tests/manual/examples/widgets/mainwindows/mdi/images/open.png Binary files differindex 45fa2883a7..45fa2883a7 100644 --- a/examples/widgets/mainwindows/mdi/images/open.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/open.png diff --git a/examples/widgets/mainwindows/mdi/images/paste.png b/tests/manual/examples/widgets/mainwindows/mdi/images/paste.png Binary files differindex c14425cad1..c14425cad1 100644 --- a/examples/widgets/mainwindows/mdi/images/paste.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/paste.png diff --git a/examples/widgets/mainwindows/mdi/images/save.png b/tests/manual/examples/widgets/mainwindows/mdi/images/save.png Binary files differindex e65a29d5f1..e65a29d5f1 100644 --- a/examples/widgets/mainwindows/mdi/images/save.png +++ b/tests/manual/examples/widgets/mainwindows/mdi/images/save.png diff --git a/examples/widgets/mainwindows/mdi/main.cpp b/tests/manual/examples/widgets/mainwindows/mdi/main.cpp index ee70050544..ee70050544 100644 --- a/examples/widgets/mainwindows/mdi/main.cpp +++ b/tests/manual/examples/widgets/mainwindows/mdi/main.cpp diff --git a/examples/widgets/mainwindows/mdi/mainwindow.cpp b/tests/manual/examples/widgets/mainwindows/mdi/mainwindow.cpp index 89998f3160..89998f3160 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.cpp +++ b/tests/manual/examples/widgets/mainwindows/mdi/mainwindow.cpp diff --git a/examples/widgets/mainwindows/mdi/mainwindow.h b/tests/manual/examples/widgets/mainwindows/mdi/mainwindow.h index 8fec975c6e..8fec975c6e 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.h +++ b/tests/manual/examples/widgets/mainwindows/mdi/mainwindow.h diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/tests/manual/examples/widgets/mainwindows/mdi/mdi.pro index f2c236f7e2..f2c236f7e2 100644 --- a/examples/widgets/mainwindows/mdi/mdi.pro +++ b/tests/manual/examples/widgets/mainwindows/mdi/mdi.pro diff --git a/examples/widgets/mainwindows/mdi/mdi.qrc b/tests/manual/examples/widgets/mainwindows/mdi/mdi.qrc index 0a776fab4d..0a776fab4d 100644 --- a/examples/widgets/mainwindows/mdi/mdi.qrc +++ b/tests/manual/examples/widgets/mainwindows/mdi/mdi.qrc diff --git a/examples/widgets/mainwindows/mdi/mdichild.cpp b/tests/manual/examples/widgets/mainwindows/mdi/mdichild.cpp index 8f96ec623d..8f96ec623d 100644 --- a/examples/widgets/mainwindows/mdi/mdichild.cpp +++ b/tests/manual/examples/widgets/mainwindows/mdi/mdichild.cpp diff --git a/examples/widgets/mainwindows/mdi/mdichild.h b/tests/manual/examples/widgets/mainwindows/mdi/mdichild.h index ba9c3d8f1c..ba9c3d8f1c 100644 --- a/examples/widgets/mainwindows/mdi/mdichild.h +++ b/tests/manual/examples/widgets/mainwindows/mdi/mdichild.h |