From 028c3b6e158ddd81e957f5b142c2ed7e63c0fa24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 14:21:55 +0200 Subject: [PATCH] Move font sampler example to manual test Change-Id: I696d9be26edfaadd40579884930b2f061d308a06 Reviewed-by: Volker Hilsheimer (cherry picked from commit 917282ea53626e4be45c6bb19682776b250948ba) Reviewed-by: Qt Cherry-pick Bot --- examples/widgets/doc/src/fontsampler.qdoc | 13 ------------- examples/widgets/painting/CMakeLists.txt | 1 - examples/widgets/painting/painting.pro | 3 +-- .../widgets/painting/fontsampler/CMakeLists.txt | 0 .../widgets/painting/fontsampler/fontsampler.pro | 0 .../examples}/widgets/painting/fontsampler/main.cpp | 0 .../widgets/painting/fontsampler/mainwindow.cpp | 0 .../widgets/painting/fontsampler/mainwindow.h | 0 .../widgets/painting/fontsampler/mainwindowbase.ui | 0 9 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 examples/widgets/doc/src/fontsampler.qdoc rename {examples => tests/manual/examples}/widgets/painting/fontsampler/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/painting/fontsampler/fontsampler.pro (100%) rename {examples => tests/manual/examples}/widgets/painting/fontsampler/main.cpp (100%) rename {examples => tests/manual/examples}/widgets/painting/fontsampler/mainwindow.cpp (100%) rename {examples => tests/manual/examples}/widgets/painting/fontsampler/mainwindow.h (100%) rename {examples => tests/manual/examples}/widgets/painting/fontsampler/mainwindowbase.ui (100%) diff --git a/examples/widgets/doc/src/fontsampler.qdoc b/examples/widgets/doc/src/fontsampler.qdoc deleted file mode 100644 index 3b014b5713..0000000000 --- a/examples/widgets/doc/src/fontsampler.qdoc +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example painting/fontsampler - \title Font Sampler Example - \ingroup examples-painting - \brief The Font Sampler example shows how to preview and print multi-page documents. - - The Font Sampler example shows how to preview and print multi-page documents. - - \image fontsampler-example.png -*/ diff --git a/examples/widgets/painting/CMakeLists.txt b/examples/widgets/painting/CMakeLists.txt index df0bfe9007..38ff34c540 100644 --- a/examples/widgets/painting/CMakeLists.txt +++ b/examples/widgets/painting/CMakeLists.txt @@ -11,4 +11,3 @@ qt_internal_add_example(pathstroke) qt_internal_add_example(imagecomposition) qt_internal_add_example(painterpaths) qt_internal_add_example(transformations) -qt_internal_add_example(fontsampler) diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro index a9749a560d..7d5c2e0209 100644 --- a/examples/widgets/painting/painting.pro +++ b/examples/widgets/painting/painting.pro @@ -8,8 +8,7 @@ SUBDIRS = basicdrawing \ pathstroke \ imagecomposition \ painterpaths \ - transformations \ - fontsampler + transformations EXAMPLE_FILES = \ shared diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/tests/manual/examples/widgets/painting/fontsampler/CMakeLists.txt similarity index 100% rename from examples/widgets/painting/fontsampler/CMakeLists.txt rename to tests/manual/examples/widgets/painting/fontsampler/CMakeLists.txt diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/tests/manual/examples/widgets/painting/fontsampler/fontsampler.pro similarity index 100% rename from examples/widgets/painting/fontsampler/fontsampler.pro rename to tests/manual/examples/widgets/painting/fontsampler/fontsampler.pro diff --git a/examples/widgets/painting/fontsampler/main.cpp b/tests/manual/examples/widgets/painting/fontsampler/main.cpp similarity index 100% rename from examples/widgets/painting/fontsampler/main.cpp rename to tests/manual/examples/widgets/painting/fontsampler/main.cpp diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/tests/manual/examples/widgets/painting/fontsampler/mainwindow.cpp similarity index 100% rename from examples/widgets/painting/fontsampler/mainwindow.cpp rename to tests/manual/examples/widgets/painting/fontsampler/mainwindow.cpp diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/tests/manual/examples/widgets/painting/fontsampler/mainwindow.h similarity index 100% rename from examples/widgets/painting/fontsampler/mainwindow.h rename to tests/manual/examples/widgets/painting/fontsampler/mainwindow.h diff --git a/examples/widgets/painting/fontsampler/mainwindowbase.ui b/tests/manual/examples/widgets/painting/fontsampler/mainwindowbase.ui similarity index 100% rename from examples/widgets/painting/fontsampler/mainwindowbase.ui rename to tests/manual/examples/widgets/painting/fontsampler/mainwindowbase.ui