From 6f96d1785f35520607eff4ace0086d17db7b432e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98ystein=20Heskestad?= Date: Wed, 1 Mar 2023 14:23:45 +0100 Subject: [PATCH] Move xmlstreamlint example into tests/manual This example is useful but not a typical starting point for an application. Task-number: QTBUG-110647 Change-Id: Ic4af8ed648c587b91110a7403fa80c619549289d Reviewed-by: Marc Mutz (cherry picked from commit e13b57d06ab6e81cf04c090cc46dd23b4f8daccf) Reviewed-by: Jani Heikkinen --- examples/xml/CMakeLists.txt | 1 - examples/xml/xml.pro | 1 - tests/manual/CMakeLists.txt | 1 + tests/manual/manual.pro | 1 + {examples/xml => tests/manual}/xmlstreamlint/CMakeLists.txt | 0 .../manual}/xmlstreamlint/doc/src/xmlstreamlint.qdoc | 0 {examples/xml => tests/manual}/xmlstreamlint/main.cpp | 0 {examples/xml => tests/manual}/xmlstreamlint/xmlstreamlint.pro | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {examples/xml => tests/manual}/xmlstreamlint/CMakeLists.txt (100%) rename {examples/xml => tests/manual}/xmlstreamlint/doc/src/xmlstreamlint.qdoc (100%) rename {examples/xml => tests/manual}/xmlstreamlint/main.cpp (100%) rename {examples/xml => tests/manual}/xmlstreamlint/xmlstreamlint.pro (100%) diff --git a/examples/xml/CMakeLists.txt b/examples/xml/CMakeLists.txt index 2ff2984a6c1..68644359517 100644 --- a/examples/xml/CMakeLists.txt +++ b/examples/xml/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(xmlstreamlint) if(TARGET Qt6::Widgets) qt_internal_add_example(dombookmarks) qt_internal_add_example(streambookmarks) diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro index 1c78e6b570a..4a2caa1648e 100644 --- a/examples/xml/xml.pro +++ b/examples/xml/xml.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = xmlstreamlint qtHaveModule(widgets) { SUBDIRS += dombookmarks \ diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 3ed0fc8b39b..71dd87f5753 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -61,6 +61,7 @@ add_subdirectory(widgetgrab) if(QT_FEATURE_xcb) add_subdirectory(xembed) endif() +add_subdirectory(xmlstreamlint) add_subdirectory(shortcuts) add_subdirectory(dialogs) add_subdirectory(windowtransparency) diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 8bbc8af8996..7bb92bb453f 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -47,6 +47,7 @@ windowflags \ windowgeometry \ windowmodality \ widgetgrab \ +xmlstreamlint \ shortcuts \ dialogs \ windowtransparency \ diff --git a/examples/xml/xmlstreamlint/CMakeLists.txt b/tests/manual/xmlstreamlint/CMakeLists.txt similarity index 100% rename from examples/xml/xmlstreamlint/CMakeLists.txt rename to tests/manual/xmlstreamlint/CMakeLists.txt diff --git a/examples/xml/xmlstreamlint/doc/src/xmlstreamlint.qdoc b/tests/manual/xmlstreamlint/doc/src/xmlstreamlint.qdoc similarity index 100% rename from examples/xml/xmlstreamlint/doc/src/xmlstreamlint.qdoc rename to tests/manual/xmlstreamlint/doc/src/xmlstreamlint.qdoc diff --git a/examples/xml/xmlstreamlint/main.cpp b/tests/manual/xmlstreamlint/main.cpp similarity index 100% rename from examples/xml/xmlstreamlint/main.cpp rename to tests/manual/xmlstreamlint/main.cpp diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/tests/manual/xmlstreamlint/xmlstreamlint.pro similarity index 100% rename from examples/xml/xmlstreamlint/xmlstreamlint.pro rename to tests/manual/xmlstreamlint/xmlstreamlint.pro