From ec01f6ae8b28f6b5cdb125e8e42e18b96f2a97a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 14:59:25 +0200 Subject: [PATCH] Move movie example to manual test Pick-to: 6.5 6.6 Change-Id: Ie185a3c88eced7b8b0fe324b9ef62ab86d38d521 Reviewed-by: Volker Hilsheimer --- examples/widgets/doc/src/movie.qdoc | 16 ---------------- examples/widgets/widgets/CMakeLists.txt | 3 --- examples/widgets/widgets/widgets.pro | 1 - .../widgets/widgets/movie/CMakeLists.txt | 0 .../widgets/widgets/movie/animation.gif | Bin .../examples}/widgets/widgets/movie/main.cpp | 0 .../examples}/widgets/widgets/movie/movie.pro | 0 .../widgets/widgets/movie/movieplayer.cpp | 0 .../widgets/widgets/movie/movieplayer.h | 0 9 files changed, 20 deletions(-) delete mode 100644 examples/widgets/doc/src/movie.qdoc rename {examples => tests/manual/examples}/widgets/widgets/movie/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/widgets/movie/animation.gif (100%) rename {examples => tests/manual/examples}/widgets/widgets/movie/main.cpp (100%) rename {examples => tests/manual/examples}/widgets/widgets/movie/movie.pro (100%) rename {examples => tests/manual/examples}/widgets/widgets/movie/movieplayer.cpp (100%) rename {examples => tests/manual/examples}/widgets/widgets/movie/movieplayer.h (100%) diff --git a/examples/widgets/doc/src/movie.qdoc b/examples/widgets/doc/src/movie.qdoc deleted file mode 100644 index d5aebc4156..0000000000 --- a/examples/widgets/doc/src/movie.qdoc +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example widgets/movie - \title Movie Example - \ingroup examples-widgets - \brief The Movie example demonstrates how to use QMovie and QLabel to - display animations. - - QMovie is mostly useful if one wants to play - a simple animation without the added complexity of a multimedia - framework to install and deploy. - - \borderedimage movie-example.png -*/ diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt index 4ad727e5d0..9c2ea872fc 100644 --- a/examples/widgets/widgets/CMakeLists.txt +++ b/examples/widgets/widgets/CMakeLists.txt @@ -6,9 +6,6 @@ qt_internal_add_example(calculator) qt_internal_add_example(calendarwidget) qt_internal_add_example(groupbox) qt_internal_add_example(lineedits) -if(QT_FEATURE_movie) - qt_internal_add_example(movie) -endif() qt_internal_add_example(scribble) qt_internal_add_example(shapedclock) qt_internal_add_example(shortcuteditor) diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro index b070e82da6..8de3dadcaa 100644 --- a/examples/widgets/widgets/widgets.pro +++ b/examples/widgets/widgets/widgets.pro @@ -4,7 +4,6 @@ SUBDIRS = analogclock \ calendarwidget \ groupbox \ lineedits \ - movie \ scribble \ shapedclock \ sliders \ diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/tests/manual/examples/widgets/widgets/movie/CMakeLists.txt similarity index 100% rename from examples/widgets/widgets/movie/CMakeLists.txt rename to tests/manual/examples/widgets/widgets/movie/CMakeLists.txt diff --git a/examples/widgets/widgets/movie/animation.gif b/tests/manual/examples/widgets/widgets/movie/animation.gif similarity index 100% rename from examples/widgets/widgets/movie/animation.gif rename to tests/manual/examples/widgets/widgets/movie/animation.gif diff --git a/examples/widgets/widgets/movie/main.cpp b/tests/manual/examples/widgets/widgets/movie/main.cpp similarity index 100% rename from examples/widgets/widgets/movie/main.cpp rename to tests/manual/examples/widgets/widgets/movie/main.cpp diff --git a/examples/widgets/widgets/movie/movie.pro b/tests/manual/examples/widgets/widgets/movie/movie.pro similarity index 100% rename from examples/widgets/widgets/movie/movie.pro rename to tests/manual/examples/widgets/widgets/movie/movie.pro diff --git a/examples/widgets/widgets/movie/movieplayer.cpp b/tests/manual/examples/widgets/widgets/movie/movieplayer.cpp similarity index 100% rename from examples/widgets/widgets/movie/movieplayer.cpp rename to tests/manual/examples/widgets/widgets/movie/movieplayer.cpp diff --git a/examples/widgets/widgets/movie/movieplayer.h b/tests/manual/examples/widgets/widgets/movie/movieplayer.h similarity index 100% rename from examples/widgets/widgets/movie/movieplayer.h rename to tests/manual/examples/widgets/widgets/movie/movieplayer.h