diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-12-12 18:32:19 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-26 20:59:50 +0000 |
| commit | a6b697ca13945a174cff9f3e9b1af1cf61c0bea5 (patch) | |
| tree | 78d5fad97ff8e89f079df29cc5a75b4e7197bfc7 /examples/corelib | |
| parent | 657894624521b580f59ff5f58b9c0e9be159dc1c (diff) | |
Create corelib/serialization and move existing file formats into it
This is in preparation to adding CBOR support. We don't need yet another
dir for CBOR and placing it in src/corelib/json is just wrong.
Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/corelib')
| -rw-r--r-- | examples/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/character.cpp (renamed from examples/corelib/json/savegame/character.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/character.h (renamed from examples/corelib/json/savegame/character.h) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/doc/src/savegame.qdoc (renamed from examples/corelib/json/savegame/doc/src/savegame.qdoc) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/game.cpp (renamed from examples/corelib/json/savegame/game.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/game.h (renamed from examples/corelib/json/savegame/game.h) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/level.cpp (renamed from examples/corelib/json/savegame/level.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/level.h (renamed from examples/corelib/json/savegame/level.h) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/main.cpp (renamed from examples/corelib/json/savegame/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/corelib/serialization/savegame/savegame.pro (renamed from examples/corelib/json/savegame/savegame.pro) | 2 | ||||
| -rw-r--r-- | examples/corelib/serialization/serialization.pro (renamed from examples/corelib/json/json.pro) | 0 |
11 files changed, 2 insertions, 2 deletions
diff --git a/examples/corelib/corelib.pro b/examples/corelib/corelib.pro index a32b8ba51a..014e8af608 100644 --- a/examples/corelib/corelib.pro +++ b/examples/corelib/corelib.pro @@ -3,7 +3,7 @@ CONFIG += no_docs_target SUBDIRS = \ ipc \ - json \ mimetypes \ + serialization \ threads \ tools diff --git a/examples/corelib/json/savegame/character.cpp b/examples/corelib/serialization/savegame/character.cpp index 046cde3091..046cde3091 100644 --- a/examples/corelib/json/savegame/character.cpp +++ b/examples/corelib/serialization/savegame/character.cpp diff --git a/examples/corelib/json/savegame/character.h b/examples/corelib/serialization/savegame/character.h index cbf06d7fd6..cbf06d7fd6 100644 --- a/examples/corelib/json/savegame/character.h +++ b/examples/corelib/serialization/savegame/character.h diff --git a/examples/corelib/json/savegame/doc/src/savegame.qdoc b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc index 06e70680c6..06e70680c6 100644 --- a/examples/corelib/json/savegame/doc/src/savegame.qdoc +++ b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc diff --git a/examples/corelib/json/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp index 4caec71a03..4caec71a03 100644 --- a/examples/corelib/json/savegame/game.cpp +++ b/examples/corelib/serialization/savegame/game.cpp diff --git a/examples/corelib/json/savegame/game.h b/examples/corelib/serialization/savegame/game.h index 3da9c148be..3da9c148be 100644 --- a/examples/corelib/json/savegame/game.h +++ b/examples/corelib/serialization/savegame/game.h diff --git a/examples/corelib/json/savegame/level.cpp b/examples/corelib/serialization/savegame/level.cpp index 8eda107f46..8eda107f46 100644 --- a/examples/corelib/json/savegame/level.cpp +++ b/examples/corelib/serialization/savegame/level.cpp diff --git a/examples/corelib/json/savegame/level.h b/examples/corelib/serialization/savegame/level.h index 393524abfd..393524abfd 100644 --- a/examples/corelib/json/savegame/level.h +++ b/examples/corelib/serialization/savegame/level.h diff --git a/examples/corelib/json/savegame/main.cpp b/examples/corelib/serialization/savegame/main.cpp index d091684211..d091684211 100644 --- a/examples/corelib/json/savegame/main.cpp +++ b/examples/corelib/serialization/savegame/main.cpp diff --git a/examples/corelib/json/savegame/savegame.pro b/examples/corelib/serialization/savegame/savegame.pro index 6706444506..15a38c32ef 100644 --- a/examples/corelib/json/savegame/savegame.pro +++ b/examples/corelib/serialization/savegame/savegame.pro @@ -8,7 +8,7 @@ CONFIG -= app_bundle TEMPLATE = app # install -target.path = $$[QT_INSTALL_EXAMPLES]/corelib/json/savegame +target.path = $$[QT_INSTALL_EXAMPLES]/corelib/serialization/savegame INSTALLS += target SOURCES += main.cpp \ diff --git a/examples/corelib/json/json.pro b/examples/corelib/serialization/serialization.pro index af4d3e6f0f..af4d3e6f0f 100644 --- a/examples/corelib/json/json.pro +++ b/examples/corelib/serialization/serialization.pro |