diff options
author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2023-02-28 17:41:48 +0100 |
---|---|---|
committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2023-03-03 09:44:54 +0100 |
commit | baaed3faa719f93656b7fe277eb9950a0c7983be (patch) | |
tree | 5fe05579131380a22af80a8327279ab4fd23c7af | |
parent | 72a132bbcd59575c7e16b6d9c7d497dbf9d60efe (diff) | |
download | qtbase-baaed3faa719f93656b7fe277eb9950a0c7983be.tar.gz |
Move Weather Anchor Layout example to manual tests
Change-Id: I8782a83b5c12b4f57bf9ef9063818cb124bddd56
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit a84b2e5973ace6327ef38644e023e0f81fad21f4)
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 1 | ||||
-rw-r--r-- | examples/widgets/doc/images/weatheranchorlayout-example.png | bin | 88805 -> 0 bytes | |||
-rw-r--r-- | examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc | 14 | ||||
-rw-r--r-- | examples/widgets/graphicsview/CMakeLists.txt | 1 | ||||
-rw-r--r-- | examples/widgets/graphicsview/graphicsview.pro | 3 | ||||
-rw-r--r-- | examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt | 53 | ||||
-rw-r--r-- | tests/auto/guiapplauncher/examples.txt | 1 | ||||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/CMakeLists.txt | 34 | ||||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/5days.jpg (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/5days.jpg) | bin | 5748 -> 5748 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/details.jpg (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/details.jpg) | bin | 5323 -> 5323 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/place.jpg (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/place.jpg) | bin | 62438 -> 62438 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/tabbar.jpg (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/tabbar.jpg) | bin | 849 -> 849 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/title.jpg (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/title.jpg) | bin | 3472 -> 3472 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/images/weather-few-clouds.png (renamed from examples/widgets/graphicsview/weatheranchorlayout/images/weather-few-clouds.png) | bin | 18976 -> 18976 bytes | |||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/main.cpp (renamed from examples/widgets/graphicsview/weatheranchorlayout/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.pro (renamed from examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro) | 0 | ||||
-rw-r--r-- | tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.qrc (renamed from examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc) | 0 |
17 files changed, 35 insertions, 72 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index d43456ceeb..a57946dd6e 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 Binary files differdeleted file mode 100644 index 59d3b55b7a..0000000000 --- a/examples/widgets/doc/images/weatheranchorlayout-example.png +++ /dev/null diff --git a/examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc b/examples/widgets/doc/src/graphicsview-weatheranchorlayout.qdoc deleted file mode 100644 index 8dbf2356a0..0000000000 --- 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 47ae1091ab..496d2179bb 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 8becd8aa9d..218ee991ce 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 31243e4d80..0000000000 --- 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 d59e14bfed..1cfa04488d 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 0000000000..9f9f3f56f9 --- /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 Binary files differindex fd92ba8ba7..fd92ba8ba7 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/5days.jpg +++ b/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 Binary files differindex fde0448c69..fde0448c69 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/details.jpg +++ b/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 Binary files differindex 03e5344330..03e5344330 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/place.jpg +++ b/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 Binary files differindex 7777662901..7777662901 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/tabbar.jpg +++ b/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 Binary files differindex fa84c8156c..fa84c8156c 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/title.jpg +++ b/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 Binary files differindex eea6ce6529..eea6ce6529 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/images/weather-few-clouds.png +++ b/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 index 1151349f24..1151349f24 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp +++ b/tests/manual/qgraphicslayout/weatheranchorlayout/main.cpp diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.pro index db1c453cb4..db1c453cb4 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +++ b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.pro diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.qrc index e39f8c0423..e39f8c0423 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.qrc +++ b/tests/manual/qgraphicslayout/weatheranchorlayout/weatheranchorlayout.qrc |