summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2023-06-07 15:32:28 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2023-07-13 17:07:27 +0200
commite57bf5b99d3668db8ac9350d179c7fd490ec4547 (patch)
treee0daacce2ad01a7460f3f56b657e69e336acb42f /examples
parentf339262217fefbdf8ba29d5f44691a3cc6ca5d0e (diff)
Move RSS listing example to networking
It's really showing how to request a resource and act on its becoming available. The use of XML to do so is incidental; the use of networking is central. Task-number: QTBUG-111228 Change-Id: Ibcf438c7ef3b2464ddfa8b96a79fb15523e4a468 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> (cherry picked from commit e54a7c56677280d9a9eb976dd455085dcce10c40)
Diffstat (limited to 'examples')
-rw-r--r--examples/corelib/serialization/CMakeLists.txt3
-rw-r--r--examples/corelib/serialization/serialization.pro2
-rw-r--r--examples/network/CMakeLists.txt1
-rw-r--r--examples/network/network.pro14
-rw-r--r--examples/network/rsslisting/CMakeLists.txt (renamed from examples/corelib/serialization/rsslisting/CMakeLists.txt)2
-rw-r--r--examples/network/rsslisting/doc/images/rsslisting.png (renamed from examples/corelib/serialization/rsslisting/doc/images/rsslisting.png)bin19739 -> 19739 bytes
-rw-r--r--examples/network/rsslisting/doc/src/rsslisting.qdoc (renamed from examples/corelib/serialization/rsslisting/doc/src/rsslisting.qdoc)0
-rw-r--r--examples/network/rsslisting/main.cpp (renamed from examples/corelib/serialization/rsslisting/main.cpp)0
-rw-r--r--examples/network/rsslisting/rsslisting.cpp (renamed from examples/corelib/serialization/rsslisting/rsslisting.cpp)0
-rw-r--r--examples/network/rsslisting/rsslisting.h (renamed from examples/corelib/serialization/rsslisting/rsslisting.h)0
-rw-r--r--examples/network/rsslisting/rsslisting.pro (renamed from examples/corelib/serialization/rsslisting/rsslisting.pro)2
11 files changed, 9 insertions, 15 deletions
diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt
index 7dd5d476d1..ad14a179b1 100644
--- a/examples/corelib/serialization/CMakeLists.txt
+++ b/examples/corelib/serialization/CMakeLists.txt
@@ -4,9 +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()
if(TARGET Qt6::Widgets)
qt_internal_add_example(streambookmarks)
endif()
diff --git a/examples/corelib/serialization/serialization.pro b/examples/corelib/serialization/serialization.pro
index 9f0ced0282..e20fcb57fd 100644
--- a/examples/corelib/serialization/serialization.pro
+++ b/examples/corelib/serialization/serialization.pro
@@ -6,6 +6,4 @@ SUBDIRS = \
qtHaveModule(widgets) {
SUBDIRS += streambookmarks
- qtHaveModule(network): SUBDIRS += \
- rsslisting
}
diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt
index 4e19a2dffd..64068ba9a0 100644
--- a/examples/network/CMakeLists.txt
+++ b/examples/network/CMakeLists.txt
@@ -18,6 +18,7 @@ if(TARGET Qt6::Widgets)
qt_internal_add_example(multicastsender)
qt_internal_add_example(fortuneclient)
qt_internal_add_example(fortuneserver)
+ qt_internal_add_example(rsslisting)
endif()
if(QT_FEATURE_processenvironment AND TARGET Qt6::Widgets)
qt_internal_add_example(network-chat)
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 7981560943..a0fc95dbf8 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -8,18 +8,16 @@ qtHaveModule(widgets) {
blockingfortuneclient \
broadcastreceiver \
broadcastsender \
+ fortuneclient \
+ fortuneserver \
http \
- threadedfortuneserver \
- torrent \
multicastreceiver \
- multicastsender
+ multicastsender \
+ rsslisting \
+ threadedfortuneserver \
+ torrent
qtConfig(processenvironment): SUBDIRS += network-chat
-
- SUBDIRS += \
- fortuneclient \
- fortuneserver
-
qtConfig(ssl): SUBDIRS += securesocketclient
qtConfig(dtls): SUBDIRS += secureudpserver secureudpclient
qtConfig(sctp): SUBDIRS += multistreamserver multistreamclient
diff --git a/examples/corelib/serialization/rsslisting/CMakeLists.txt b/examples/network/rsslisting/CMakeLists.txt
index 405a01ce56..fc9d8d12ed 100644
--- a/examples/corelib/serialization/rsslisting/CMakeLists.txt
+++ b/examples/network/rsslisting/CMakeLists.txt
@@ -8,7 +8,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/serialization/rsslisting")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/network/rsslisting")
find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Widgets)
diff --git a/examples/corelib/serialization/rsslisting/doc/images/rsslisting.png b/examples/network/rsslisting/doc/images/rsslisting.png
index 0b05375f93..0b05375f93 100644
--- a/examples/corelib/serialization/rsslisting/doc/images/rsslisting.png
+++ b/examples/network/rsslisting/doc/images/rsslisting.png
Binary files differ
diff --git a/examples/corelib/serialization/rsslisting/doc/src/rsslisting.qdoc b/examples/network/rsslisting/doc/src/rsslisting.qdoc
index 260d26811c..260d26811c 100644
--- a/examples/corelib/serialization/rsslisting/doc/src/rsslisting.qdoc
+++ b/examples/network/rsslisting/doc/src/rsslisting.qdoc
diff --git a/examples/corelib/serialization/rsslisting/main.cpp b/examples/network/rsslisting/main.cpp
index 7a64db8a0c..7a64db8a0c 100644
--- a/examples/corelib/serialization/rsslisting/main.cpp
+++ b/examples/network/rsslisting/main.cpp
diff --git a/examples/corelib/serialization/rsslisting/rsslisting.cpp b/examples/network/rsslisting/rsslisting.cpp
index ed7c163c76..ed7c163c76 100644
--- a/examples/corelib/serialization/rsslisting/rsslisting.cpp
+++ b/examples/network/rsslisting/rsslisting.cpp
diff --git a/examples/corelib/serialization/rsslisting/rsslisting.h b/examples/network/rsslisting/rsslisting.h
index 499bc5d1d4..499bc5d1d4 100644
--- a/examples/corelib/serialization/rsslisting/rsslisting.h
+++ b/examples/network/rsslisting/rsslisting.h
diff --git a/examples/corelib/serialization/rsslisting/rsslisting.pro b/examples/network/rsslisting/rsslisting.pro
index 7619755b8f..aacbe3127f 100644
--- a/examples/corelib/serialization/rsslisting/rsslisting.pro
+++ b/examples/network/rsslisting/rsslisting.pro
@@ -4,5 +4,5 @@ QT += network widgets
requires(qtConfig(treewidget))
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/serialization/rsslisting
+target.path = $$[QT_INSTALL_EXAMPLES]/network/rsslisting
INSTALLS += target