From 8b8b7467bf3fd56ce2137f21c226c66c0ee12932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 13:29:58 +0200 Subject: [PATCH] Move border layout example to manual test Change-Id: I3f45043a64275f8678288e1d9839271eafa1fd2b Reviewed-by: Volker Hilsheimer (cherry picked from commit 42b58f8cb41790169eb2ebcd215cf2696dcecbe7) Reviewed-by: Qt Cherry-pick Bot --- examples/widgets/doc/src/borderlayout.qdoc | 46 ------------------- examples/widgets/layouts/CMakeLists.txt | 1 - examples/widgets/layouts/layouts.pro | 1 - .../layouts/borderlayout/CMakeLists.txt | 0 .../layouts/borderlayout/borderlayout.cpp | 0 .../layouts/borderlayout/borderlayout.h | 0 .../layouts/borderlayout/borderlayout.pro | 0 .../widgets/layouts/borderlayout/main.cpp | 0 .../widgets/layouts/borderlayout/window.cpp | 0 .../widgets/layouts/borderlayout/window.h | 0 10 files changed, 48 deletions(-) delete mode 100644 examples/widgets/doc/src/borderlayout.qdoc rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/borderlayout.cpp (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/borderlayout.h (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/borderlayout.pro (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/main.cpp (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/window.cpp (100%) rename {examples => tests/manual/examples}/widgets/layouts/borderlayout/window.h (100%) diff --git a/examples/widgets/doc/src/borderlayout.qdoc b/examples/widgets/doc/src/borderlayout.qdoc deleted file mode 100644 index 9ec5e96d78f..00000000000 --- a/examples/widgets/doc/src/borderlayout.qdoc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example layouts/borderlayout - \title Border Layout Example - \ingroup examples-layout - \brief Shows how to arrange child widgets along a border. - - \e{Border Layout} implements a layout that arranges child widgets to - surround the main area. - - \image borderlayout-example.png - - The constructor of the Window class creates a QTextBrowser object, - to which a BorderLayout named \c layout is added. The declaration - of the BorderLayout class is quoted at the end of this document. - - \quotefromfile layouts/borderlayout/window.cpp - \skipto Window::Window() - \printuntil BorderLayout - - Several labeled widgets are added to \c layout with the orientation - \c {Center}, \c {North}, \c {West}, \c {East 1}, \c {East 2}, and - \c {South}. - - \skipto layout->addWidget - \printuntil setWindowTitle - - createLabel() in class \c Window sets the text of the labeled widgets - and the style. - - \skipto QLabel *Window::createLabel - \printuntil /^\}/ - - Class BorderLayout contains all the utilitarian functions for formatting - the widgets it contains. - - \quotefromfile layouts/borderlayout/borderlayout.h - \skipto class - \printuntil /^\}/ - - For more information, visit the \l{Layout Management} page. - - \include examples-run.qdocinc -*/ diff --git a/examples/widgets/layouts/CMakeLists.txt b/examples/widgets/layouts/CMakeLists.txt index 60299638c49..0afe0fb07c5 100644 --- a/examples/widgets/layouts/CMakeLists.txt +++ b/examples/widgets/layouts/CMakeLists.txt @@ -2,6 +2,5 @@ # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_example(basiclayouts) -qt_internal_add_example(borderlayout) qt_internal_add_example(dynamiclayouts) qt_internal_add_example(flowlayout) diff --git a/examples/widgets/layouts/layouts.pro b/examples/widgets/layouts/layouts.pro index c641e8cf7f2..6821e33359b 100644 --- a/examples/widgets/layouts/layouts.pro +++ b/examples/widgets/layouts/layouts.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs SUBDIRS = basiclayouts \ - borderlayout \ dynamiclayouts \ flowlayout diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/tests/manual/examples/widgets/layouts/borderlayout/CMakeLists.txt similarity index 100% rename from examples/widgets/layouts/borderlayout/CMakeLists.txt rename to tests/manual/examples/widgets/layouts/borderlayout/CMakeLists.txt diff --git a/examples/widgets/layouts/borderlayout/borderlayout.cpp b/tests/manual/examples/widgets/layouts/borderlayout/borderlayout.cpp similarity index 100% rename from examples/widgets/layouts/borderlayout/borderlayout.cpp rename to tests/manual/examples/widgets/layouts/borderlayout/borderlayout.cpp diff --git a/examples/widgets/layouts/borderlayout/borderlayout.h b/tests/manual/examples/widgets/layouts/borderlayout/borderlayout.h similarity index 100% rename from examples/widgets/layouts/borderlayout/borderlayout.h rename to tests/manual/examples/widgets/layouts/borderlayout/borderlayout.h diff --git a/examples/widgets/layouts/borderlayout/borderlayout.pro b/tests/manual/examples/widgets/layouts/borderlayout/borderlayout.pro similarity index 100% rename from examples/widgets/layouts/borderlayout/borderlayout.pro rename to tests/manual/examples/widgets/layouts/borderlayout/borderlayout.pro diff --git a/examples/widgets/layouts/borderlayout/main.cpp b/tests/manual/examples/widgets/layouts/borderlayout/main.cpp similarity index 100% rename from examples/widgets/layouts/borderlayout/main.cpp rename to tests/manual/examples/widgets/layouts/borderlayout/main.cpp diff --git a/examples/widgets/layouts/borderlayout/window.cpp b/tests/manual/examples/widgets/layouts/borderlayout/window.cpp similarity index 100% rename from examples/widgets/layouts/borderlayout/window.cpp rename to tests/manual/examples/widgets/layouts/borderlayout/window.cpp diff --git a/examples/widgets/layouts/borderlayout/window.h b/tests/manual/examples/widgets/layouts/borderlayout/window.h similarity index 100% rename from examples/widgets/layouts/borderlayout/window.h rename to tests/manual/examples/widgets/layouts/borderlayout/window.h