diff options
| author | Øystein Heskestad <oystein.heskestad@qt.io> | 2023-03-03 17:41:43 +0100 |
|---|---|---|
| committer | Øystein Heskestad <oystein.heskestad@qt.io> | 2023-03-21 14:49:09 +0100 |
| commit | 10b4c06b4928d12addc7e55e4a6e5ed537a63942 (patch) | |
| tree | 33f521c8fd692bf63618156aabb14dcb6009771c | |
| parent | 3c521e1fb42885e070bf07f36349a1e8cdb39e76 (diff) | |
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>
| -rw-r--r-- | examples/corelib/serialization/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/corelib/serialization/rsslisting/CMakeLists.txt (renamed from examples/xml/rsslisting/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | examples/corelib/serialization/rsslisting/main.cpp (renamed from examples/xml/rsslisting/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/rsslisting/rsslisting.cpp (renamed from examples/xml/rsslisting/rsslisting.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/rsslisting/rsslisting.h (renamed from examples/xml/rsslisting/rsslisting.h) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/rsslisting/rsslisting.pro (renamed from examples/xml/rsslisting/rsslisting.pro) | 2 | ||||
| -rw-r--r-- | examples/corelib/serialization/serialization.pro | 5 | ||||
| -rw-r--r-- | examples/xml/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/xml/xml.pro | 3 |
9 files changed, 10 insertions, 8 deletions
diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt index 9609b0a107..0110eb8fff 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 index d03979de82..405a01ce56 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 index 9337e5f352..9337e5f352 100644 --- a/examples/xml/rsslisting/main.cpp +++ b/examples/corelib/serialization/rsslisting/main.cpp diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/corelib/serialization/rsslisting/rsslisting.cpp index 9269be4080..9269be4080 100644 --- a/examples/xml/rsslisting/rsslisting.cpp +++ b/examples/corelib/serialization/rsslisting/rsslisting.cpp diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/corelib/serialization/rsslisting/rsslisting.h index 81c655f677..81c655f677 100644 --- a/examples/xml/rsslisting/rsslisting.h +++ b/examples/corelib/serialization/rsslisting/rsslisting.h diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/corelib/serialization/rsslisting/rsslisting.pro index c84347c15e..7619755b8f 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 7651444f19..f36b467783 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 6864435951..d97185f647 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 4a2caa1648..991d5a69d2 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 } |