summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-12-12 18:32:19 -0800
committerThiago Macieira <thiago.macieira@intel.com>2018-01-26 20:59:50 +0000
commita6b697ca13945a174cff9f3e9b1af1cf61c0bea5 (patch)
tree78d5fad97ff8e89f079df29cc5a75b4e7197bfc7 /src/tools
parent657894624521b580f59ff5f58b9c0e9be159dc1c (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 'src/tools')
-rw-r--r--src/tools/bootstrap/bootstrap.pro22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index a88333f03a..a45382106a 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -32,7 +32,6 @@ SOURCES += \
../../corelib/global/qrandom.cpp \
../../corelib/io/qabstractfileengine.cpp \
../../corelib/io/qbuffer.cpp \
- ../../corelib/io/qdatastream.cpp \
../../corelib/io/qdebug.cpp \
../../corelib/io/qdir.cpp \
../../corelib/io/qdiriterator.cpp \
@@ -47,7 +46,6 @@ SOURCES += \
../../corelib/io/qresource.cpp \
../../corelib/io/qtemporarydir.cpp \
../../corelib/io/qtemporaryfile.cpp \
- ../../corelib/io/qtextstream.cpp \
../../corelib/io/qsavefile.cpp \
../../corelib/io/qstandardpaths.cpp \
../../corelib/io/qloggingcategory.cpp \
@@ -58,6 +56,17 @@ SOURCES += \
../../corelib/kernel/qvariant.cpp \
../../corelib/kernel/qsystemerror.cpp \
../../corelib/plugin/quuid.cpp \
+ ../../corelib/serialization/qdatastream.cpp \
+ ../../corelib/serialization/qjson.cpp \
+ ../../corelib/serialization/qjsondocument.cpp \
+ ../../corelib/serialization/qjsonobject.cpp \
+ ../../corelib/serialization/qjsonarray.cpp \
+ ../../corelib/serialization/qjsonvalue.cpp \
+ ../../corelib/serialization/qjsonparser.cpp \
+ ../../corelib/serialization/qjsonwriter.cpp \
+ ../../corelib/serialization/qtextstream.cpp \
+ ../../corelib/serialization/qxmlutils.cpp \
+ ../../corelib/serialization/qxmlstream.cpp \
../../corelib/tools/qbitarray.cpp \
../../corelib/tools/qbytearray.cpp \
../../corelib/tools/qarraydata.cpp \
@@ -84,15 +93,6 @@ SOURCES += \
../../corelib/tools/qstringlist.cpp \
../../corelib/tools/qversionnumber.cpp \
../../corelib/tools/qvsnprintf.cpp \
- ../../corelib/xml/qxmlutils.cpp \
- ../../corelib/xml/qxmlstream.cpp \
- ../../corelib/json/qjson.cpp \
- ../../corelib/json/qjsondocument.cpp \
- ../../corelib/json/qjsonobject.cpp \
- ../../corelib/json/qjsonarray.cpp \
- ../../corelib/json/qjsonvalue.cpp \
- ../../corelib/json/qjsonparser.cpp \
- ../../corelib/json/qjsonwriter.cpp \
../../xml/dom/qdom.cpp \
../../xml/sax/qxml.cpp