From e57bf5b99d3668db8ac9350d179c7fd490ec4547 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 7 Jun 2023 15:32:28 +0200 Subject: [PATCH] Move RSS listing example to networking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit e54a7c56677280d9a9eb976dd455085dcce10c40) --- examples/corelib/serialization/CMakeLists.txt | 3 --- examples/corelib/serialization/serialization.pro | 2 -- examples/network/CMakeLists.txt | 1 + examples/network/network.pro | 14 ++++++-------- .../rsslisting/CMakeLists.txt | 2 +- .../rsslisting/doc/images/rsslisting.png | Bin .../rsslisting/doc/src/rsslisting.qdoc | 0 .../serialization => network}/rsslisting/main.cpp | 0 .../rsslisting/rsslisting.cpp | 0 .../rsslisting/rsslisting.h | 0 .../rsslisting/rsslisting.pro | 2 +- 11 files changed, 9 insertions(+), 15 deletions(-) rename examples/{corelib/serialization => network}/rsslisting/CMakeLists.txt (90%) rename examples/{corelib/serialization => network}/rsslisting/doc/images/rsslisting.png (100%) rename examples/{corelib/serialization => network}/rsslisting/doc/src/rsslisting.qdoc (100%) rename examples/{corelib/serialization => network}/rsslisting/main.cpp (100%) rename examples/{corelib/serialization => network}/rsslisting/rsslisting.cpp (100%) rename examples/{corelib/serialization => network}/rsslisting/rsslisting.h (100%) rename examples/{corelib/serialization => network}/rsslisting/rsslisting.pro (66%) diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt index 7dd5d476d12..ad14a179b11 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 9f0ced02824..e20fcb57fd8 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 4e19a2dffd3..64068ba9a05 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 79815609434..a0fc95dbf83 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 similarity index 90% rename from examples/corelib/serialization/rsslisting/CMakeLists.txt rename to examples/network/rsslisting/CMakeLists.txt index 405a01ce56e..fc9d8d12ed4 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 similarity index 100% rename from examples/corelib/serialization/rsslisting/doc/images/rsslisting.png rename to examples/network/rsslisting/doc/images/rsslisting.png diff --git a/examples/corelib/serialization/rsslisting/doc/src/rsslisting.qdoc b/examples/network/rsslisting/doc/src/rsslisting.qdoc similarity index 100% rename from examples/corelib/serialization/rsslisting/doc/src/rsslisting.qdoc rename to examples/network/rsslisting/doc/src/rsslisting.qdoc diff --git a/examples/corelib/serialization/rsslisting/main.cpp b/examples/network/rsslisting/main.cpp similarity index 100% rename from examples/corelib/serialization/rsslisting/main.cpp rename to examples/network/rsslisting/main.cpp diff --git a/examples/corelib/serialization/rsslisting/rsslisting.cpp b/examples/network/rsslisting/rsslisting.cpp similarity index 100% rename from examples/corelib/serialization/rsslisting/rsslisting.cpp rename to examples/network/rsslisting/rsslisting.cpp diff --git a/examples/corelib/serialization/rsslisting/rsslisting.h b/examples/network/rsslisting/rsslisting.h similarity index 100% rename from examples/corelib/serialization/rsslisting/rsslisting.h rename to examples/network/rsslisting/rsslisting.h diff --git a/examples/corelib/serialization/rsslisting/rsslisting.pro b/examples/network/rsslisting/rsslisting.pro similarity index 66% rename from examples/corelib/serialization/rsslisting/rsslisting.pro rename to examples/network/rsslisting/rsslisting.pro index 7619755b8ff..aacbe3127f7 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