From 10b4c06b4928d12addc7e55e4a6e5ed537a63942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98ystein=20Heskestad?= <oystein.heskestad@qt.io>
Date: Fri, 3 Mar 2023 17:41:43 +0100
Subject: [PATCH] Move rsslisting example into corelibe/serialization

The implementation of the stream-based XML parser resides in
coreslib/serialization. Moving the rsslisting example there.

Task-number: QTBUG-110647
Pick-to: 6.5
Change-Id: I862909e767301250750b6ee0d8ac7e20d6bad2b1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 examples/corelib/serialization/CMakeLists.txt                | 3 +++
 .../{xml => corelib/serialization}/rsslisting/CMakeLists.txt | 2 +-
 examples/{xml => corelib/serialization}/rsslisting/main.cpp  | 0
 .../{xml => corelib/serialization}/rsslisting/rsslisting.cpp | 0
 .../{xml => corelib/serialization}/rsslisting/rsslisting.h   | 0
 .../{xml => corelib/serialization}/rsslisting/rsslisting.pro | 2 +-
 examples/corelib/serialization/serialization.pro             | 5 +++++
 examples/xml/CMakeLists.txt                                  | 3 ---
 examples/xml/xml.pro                                         | 3 ---
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename examples/{xml => corelib/serialization}/rsslisting/CMakeLists.txt (90%)
 rename examples/{xml => corelib/serialization}/rsslisting/main.cpp (100%)
 rename examples/{xml => corelib/serialization}/rsslisting/rsslisting.cpp (100%)
 rename examples/{xml => corelib/serialization}/rsslisting/rsslisting.h (100%)
 rename examples/{xml => corelib/serialization}/rsslisting/rsslisting.pro (66%)

diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt
index 9609b0a107d..0110eb8fff9 100644
--- a/examples/corelib/serialization/CMakeLists.txt
+++ b/examples/corelib/serialization/CMakeLists.txt
@@ -4,3 +4,6 @@
 qt_internal_add_example(cbordump)
 qt_internal_add_example(convert)
 qt_internal_add_example(savegame)
+if(TARGET Qt6::Network AND TARGET Qt6::Widgets)
+    qt_internal_add_example(rsslisting)
+endif()
diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/corelib/serialization/rsslisting/CMakeLists.txt
similarity index 90%
rename from examples/xml/rsslisting/CMakeLists.txt
rename to examples/corelib/serialization/rsslisting/CMakeLists.txt
index d03979de822..405a01ce56e 100644
--- a/examples/xml/rsslisting/CMakeLists.txt
+++ b/examples/corelib/serialization/rsslisting/CMakeLists.txt
@@ -8,7 +8,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/xml/rsslisting")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/serialization/rsslisting")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Widgets)
 
diff --git a/examples/xml/rsslisting/main.cpp b/examples/corelib/serialization/rsslisting/main.cpp
similarity index 100%
rename from examples/xml/rsslisting/main.cpp
rename to examples/corelib/serialization/rsslisting/main.cpp
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/corelib/serialization/rsslisting/rsslisting.cpp
similarity index 100%
rename from examples/xml/rsslisting/rsslisting.cpp
rename to examples/corelib/serialization/rsslisting/rsslisting.cpp
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/corelib/serialization/rsslisting/rsslisting.h
similarity index 100%
rename from examples/xml/rsslisting/rsslisting.h
rename to examples/corelib/serialization/rsslisting/rsslisting.h
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/corelib/serialization/rsslisting/rsslisting.pro
similarity index 66%
rename from examples/xml/rsslisting/rsslisting.pro
rename to examples/corelib/serialization/rsslisting/rsslisting.pro
index c84347c15ef..7619755b8ff 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/corelib/serialization/rsslisting/rsslisting.pro
@@ -4,5 +4,5 @@ QT += network widgets
 requires(qtConfig(treewidget))
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/serialization/rsslisting
 INSTALLS += target
diff --git a/examples/corelib/serialization/serialization.pro b/examples/corelib/serialization/serialization.pro
index 7651444f199..f36b4677831 100644
--- a/examples/corelib/serialization/serialization.pro
+++ b/examples/corelib/serialization/serialization.pro
@@ -3,3 +3,8 @@ SUBDIRS = \
     cbordump \
     convert \
     savegame
+
+qtHaveModule(widgets) {
+    qtHaveModule(network): SUBDIRS += \
+                rsslisting
+}
diff --git a/examples/xml/CMakeLists.txt b/examples/xml/CMakeLists.txt
index 68644359517..d97185f6479 100644
--- a/examples/xml/CMakeLists.txt
+++ b/examples/xml/CMakeLists.txt
@@ -5,6 +5,3 @@ if(TARGET Qt6::Widgets)
     qt_internal_add_example(dombookmarks)
     qt_internal_add_example(streambookmarks)
 endif()
-if(TARGET Qt6::Network AND TARGET Qt6::Widgets)
-    qt_internal_add_example(rsslisting)
-endif()
diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro
index 4a2caa1648e..991d5a69d28 100644
--- a/examples/xml/xml.pro
+++ b/examples/xml/xml.pro
@@ -3,7 +3,4 @@ TEMPLATE      = subdirs
 qtHaveModule(widgets) {
     SUBDIRS +=  dombookmarks \
                 streambookmarks
-
-    qtHaveModule(network): SUBDIRS += \
-                rsslisting
 }