diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index d43456ceeb8..a57946dd6e6 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -188,7 +188,6 @@ manifestmeta.ios.names = "QtCore/Contiguous Cache Example" \ "QtWidgets/Embedded Dialogs" \ "QtWidgets/Graphics View Flow Layout Example" \ "QtWidgets/Simple Anchor Layout Example" \ - "QtWidgets/Weather Anchor Layout Example" \ "QtWidgets/Address Book" \ "QtWidgets/Basic Sort/Filter Model Example" \ "QtWidgets/Chart Example" \ diff --git a/examples/widgets/doc/images/weatheranchorlayout-example.png b/examples/widgets/doc/images/weatheranchorlayout-example.png deleted file mode 100644 index 59d3b55b7a0..00000000000 Binary files a/examples/widgets/doc/images/weatheranchorlayout-example.png and /dev/null differ diff --git a/examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc b/examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc deleted file mode 100644 index 8dbf2356a02..00000000000 --- a/examples/widgets/doc/src/graphicsview-weatheranchorlayout.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 graphicsview/weatheranchorlayout - \title Weather Anchor Layout Example - \ingroup examples-graphicsview-layout - \brief Demonstrates anchor layout on a graphics view scene. - - The Weather Anchor Layout example shows more complex use of the - QGraphicsAnchorLayout class to create a real-world window layout. - - \image weatheranchorlayout-example.png -*/ diff --git a/examples/widgets/graphicsview/CMakeLists.txt b/examples/widgets/graphicsview/CMakeLists.txt index 47ae1091ab4..496d2179bb3 100644 --- a/examples/widgets/graphicsview/CMakeLists.txt +++ b/examples/widgets/graphicsview/CMakeLists.txt @@ -10,7 +10,6 @@ qt_internal_add_example(diagramscene) qt_internal_add_example(flowlayout) qt_internal_add_example(anchorlayout) qt_internal_add_example(simpleanchorlayout) -qt_internal_add_example(weatheranchorlayout) if(QT_FEATURE_cursor AND QT_FEATURE_draganddrop) qt_internal_add_example(dragdroprobot) endif() diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 8becd8aa9d3..218ee991ce1 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/examples/widgets/graphicsview/graphicsview.pro @@ -9,7 +9,6 @@ SUBDIRS = \ dragdroprobot \ flowlayout \ anchorlayout \ - simpleanchorlayout \ - weatheranchorlayout + simpleanchorlayout contains(DEFINES, QT_NO_CURSOR)|!qtConfig(draganddrop): SUBDIRS -= dragdroprobot diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt deleted file mode 100644 index 31243e4d80d..00000000000 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(weatheranchorlayout LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/weatheranchorlayout") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -qt_add_executable(weatheranchorlayout - main.cpp -) - -set_target_properties(weatheranchorlayout PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(weatheranchorlayout PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -# Resources: -set(weatheranchorlayout_resource_files - "images/5days.jpg" - "images/details.jpg" - "images/place.jpg" - "images/tabbar.jpg" - "images/title.jpg" - "images/weather-few-clouds.png" -) - -qt_add_resources(weatheranchorlayout "weatheranchorlayout" - PREFIX - "/" - FILES - ${weatheranchorlayout_resource_files} -) - -install(TARGETS weatheranchorlayout - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt index d59e14bfedc..1cfa04488d6 100644 --- a/tests/auto/guiapplauncher/examples.txt +++ b/tests/auto/guiapplauncher/examples.txt @@ -20,7 +20,6 @@ "graphicsview/flowlayout Example", "examples/widgets/graphicsview/flowlayout", "flowlayout", 10, -1 "graphicsview/portedasteroids Example", "examples/widgets/graphicsview/portedasteroids", "portedasteroids", 10, -1 "graphicsview/portedcanvas Example", "examples/widgets/graphicsview/portedcanvas", "portedcanvas", 10, -1 -"graphicsview/weatheranchorlayout Example", "examples/widgets/graphicsview/weatheranchorlayout", "weatheranchorlayout", 10, -1 "itemviews/addressbook Example", "examples/widgets/itemviews/addressbook", "addressbook", 0, -1 "itemviews/basicsortfiltermodel Example", "examples/widgets/itemviews/basicsortfiltermodel", "basicsortfiltermodel", 10, -1 "itemviews/chart Example", "examples/widgets/itemviews/chart", "chart", 0, -1 diff --git a/tests/manual/qgraphicslayout/weatheranchorlayout/CMakeLists.txt b/tests/manual/qgraphicslayout/weatheranchorlayout/CMakeLists.txt new file mode 100644 index 00000000000..9f9f3f56f95 --- /dev/null +++ b/tests/manual/qgraphicslayout/weatheranchorlayout/CMakeLists.txt @@ -0,0 +1,34 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## weatheranchorlayout Binary: +##################################################################### +cmake_minimum_required(VERSION 3.16) + +qt_internal_add_manual_test(weatheranchorlayout + GUI + SOURCES + main.cpp + LIBRARIES + Qt::Gui + Qt::Widgets +) + +# Resources: +set(weatheranchorlayout_resource_files + "images/5days.jpg" + "images/details.jpg" + "images/place.jpg" + "images/tabbar.jpg" + "images/title.jpg" + "images/weather-few-clouds.png" +) + +qt_add_resources(weatheranchorlayout "weatheranchorlayout" + PREFIX + "/" + FILES + ${weatheranchorlayout_resource_files} +) + diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/5days.jpg b/tests/manual/qgraphicslayout/weatheranchorlayout/images/5days.jpg similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/5days.jpg rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/5days.jpg diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/details.jpg b/tests/manual/qgraphicslayout/weatheranchorlayout/images/details.jpg similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/details.jpg rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/details.jpg diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/place.jpg b/tests/manual/qgraphicslayout/weatheranchorlayout/images/place.jpg similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/place.jpg rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/place.jpg diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/tabbar.jpg b/tests/manual/qgraphicslayout/weatheranchorlayout/images/tabbar.jpg similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/tabbar.jpg rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/tabbar.jpg diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/title.jpg b/tests/manual/qgraphicslayout/weatheranchorlayout/images/title.jpg similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/title.jpg rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/title.jpg diff --git a/examples/widgets/graphicsview/weatheranchorlayout/images/weather-few-clouds.png b/tests/manual/qgraphicslayout/weatheranchorlayout/images/weather-few-clouds.png similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/images/weather-few-clouds.png rename to tests/manual/qgraphicslayout/weatheranchorlayout/images/weather-few-clouds.png diff --git a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp b/tests/manual/qgraphicslayout/weatheranchorlayout/main.cpp similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/main.cpp rename to tests/manual/qgraphicslayout/weatheranchorlayout/main.cpp diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.pro similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro rename to tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.pro diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.qrc similarity index 100% rename from examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc rename to tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.qrc