From 89bf0d53121604951fc4cce50bbbb35d04a09a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 14:43:36 +0200 Subject: [PATCH] Move MDI example to manual test Change-Id: Ide698a171a4600cb4bac6574b6be74c17f779051 Reviewed-by: Volker Hilsheimer (cherry picked from commit 4b79834e1a88461eb0cd8d19125130ed973651fa) Reviewed-by: Qt Cherry-pick Bot --- examples/widgets/doc/src/mdi.qdoc | 14 -------------- examples/widgets/mainwindows/CMakeLists.txt | 1 - examples/widgets/mainwindows/mainwindows.pro | 1 - .../tutorials/notepad/gettingstartedqt.qdoc | 4 ---- src/widgets/kernel/qwidget.cpp | 2 +- src/widgets/widgets/qmainwindow.cpp | 2 +- .../widgets/mainwindows/mdi/CMakeLists.txt | 0 .../widgets/mainwindows/mdi/images/copy.png | Bin .../widgets/mainwindows/mdi/images/cut.png | Bin .../widgets/mainwindows/mdi/images/new.png | Bin .../widgets/mainwindows/mdi/images/open.png | Bin .../widgets/mainwindows/mdi/images/paste.png | Bin .../widgets/mainwindows/mdi/images/save.png | Bin .../examples}/widgets/mainwindows/mdi/main.cpp | 0 .../widgets/mainwindows/mdi/mainwindow.cpp | 0 .../widgets/mainwindows/mdi/mainwindow.h | 0 .../examples}/widgets/mainwindows/mdi/mdi.pro | 0 .../examples}/widgets/mainwindows/mdi/mdi.qrc | 0 .../widgets/mainwindows/mdi/mdichild.cpp | 0 .../examples}/widgets/mainwindows/mdi/mdichild.h | 0 20 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 examples/widgets/doc/src/mdi.qdoc rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/copy.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/cut.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/new.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/open.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/paste.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/images/save.png (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/main.cpp (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mainwindow.cpp (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mainwindow.h (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mdi.pro (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mdi.qrc (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mdichild.cpp (100%) rename {examples => tests/manual/examples}/widgets/mainwindows/mdi/mdichild.h (100%) diff --git a/examples/widgets/doc/src/mdi.qdoc b/examples/widgets/doc/src/mdi.qdoc deleted file mode 100644 index 23daeeb9bd4..00000000000 --- 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 3a96fbbdb3d..78c27043668 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 7ab042085fc..7ed44f1817d 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 152bf8c1140..d011cfd9951 100644 --- a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc +++ b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc @@ -486,10 +486,6 @@ \header \li About \li Here - \row - \li MDI applications - \li QMdiArea, - \l{MDI Example} \row \li Files and I/O devices \li QFile, QIODevice diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index f25a8695c76..f47f0ac00f2 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -11510,7 +11510,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 a4af82af120..10489f830b4 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -277,7 +277,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 similarity index 100% rename from examples/widgets/mainwindows/mdi/CMakeLists.txt rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/copy.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/cut.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/new.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/open.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/paste.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/images/save.png rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/main.cpp rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mainwindow.cpp rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mainwindow.h rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mdi.pro rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mdi.qrc rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mdichild.cpp rename to 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 similarity index 100% rename from examples/widgets/mainwindows/mdi/mdichild.h rename to tests/manual/examples/widgets/mainwindows/mdi/mdichild.h