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>
This commit is contained in:
parent
6578946245
commit
a6b697ca13
@ -3,7 +3,7 @@ CONFIG += no_docs_target
|
|||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
ipc \
|
ipc \
|
||||||
json \
|
|
||||||
mimetypes \
|
mimetypes \
|
||||||
|
serialization \
|
||||||
threads \
|
threads \
|
||||||
tools
|
tools
|
||||||
|
@ -8,7 +8,7 @@ CONFIG -= app_bundle
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
|
||||||
# install
|
# install
|
||||||
target.path = $$[QT_INSTALL_EXAMPLES]/corelib/json/savegame
|
target.path = $$[QT_INSTALL_EXAMPLES]/corelib/serialization/savegame
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
|
||||||
SOURCES += main.cpp \
|
SOURCES += main.cpp \
|
@ -77,7 +77,6 @@ DEPEND_SRC = \
|
|||||||
$(SOURCE_PATH)/src/corelib/global/qrandom.cpp \
|
$(SOURCE_PATH)/src/corelib/global/qrandom.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qdatastream.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/io/qdebug.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qdebug.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qdir.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qdir.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
|
||||||
@ -91,18 +90,21 @@ DEPEND_SRC = \
|
|||||||
$(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp \
|
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/io/qtextstream.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjson.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
|
$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
|
||||||
$(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
|
$(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
|
$(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
|
$(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
|
$(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjson.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjsondocument.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjsonparser.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qjsonvalue.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qxmlstream.cpp \
|
||||||
|
$(SOURCE_PATH)/src/corelib/serialization/qxmlutils.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \
|
$(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
|
$(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp\
|
$(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp\
|
||||||
@ -123,8 +125,6 @@ DEPEND_SRC = \
|
|||||||
$(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp \
|
$(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
|
$(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp \
|
$(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp \
|
||||||
$(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \
|
|
||||||
$(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
|
|
||||||
$(QTSRCS) $(QTSRCS2)
|
$(QTSRCS) $(QTSRCS2)
|
||||||
# QTSRCS and QTSRCS2 come from Makefile.unix.* (concatenated with this
|
# QTSRCS and QTSRCS2 come from Makefile.unix.* (concatenated with this
|
||||||
# by configure); QTSRCS2 may include *.mm entries on macOS.
|
# by configure); QTSRCS2 may include *.mm entries on macOS.
|
||||||
@ -256,9 +256,6 @@ projectgenerator.o: $(QMKSRC)/generators/projectgenerator.cpp
|
|||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
|
||||||
qtextstream.o: $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp
|
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
|
qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
@ -367,9 +364,6 @@ qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp
|
|||||||
qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp
|
qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp
|
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
|
qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
@ -454,34 +448,40 @@ qlinkedlist.o: $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp
|
|||||||
qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
|
qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
|
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
|
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp
|
qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
|
qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjson.o: $(SOURCE_PATH)/src/corelib/json/qjson.cpp
|
qdatastream.o: $(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjsondocument.o: $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp
|
qjson.o: $(SOURCE_PATH)/src/corelib/serialization/qjson.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjsonparser.o: $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp
|
qjsondocument.o: $(SOURCE_PATH)/src/corelib/serialization/qjsondocument.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjsonarray.o: $(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp
|
qjsonparser.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonparser.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjsonobject.o: $(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp
|
qjsonarray.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
qjsonvalue.o: $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp
|
qjsonobject.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp
|
||||||
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
qjsonvalue.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonvalue.cpp
|
||||||
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
qxmlstream.o: $(SOURCE_PATH)/src/corelib/serialization/qxmlstream.cpp
|
||||||
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
qxmlutils.o: $(SOURCE_PATH)/src/corelib/serialization/qxmlutils.cpp
|
||||||
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
qtextstream.o: $(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp
|
||||||
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
$(CXX) -c -o $@ $(CXXFLAGS) $<
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it
|
# DO NOT DELETE THIS LINE -- make depend depends on it
|
||||||
|
@ -197,15 +197,12 @@ qmake_pch.obj:
|
|||||||
{$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj::
|
{$(SOURCE_PATH)\src\corelib\plugin}.cpp{}.obj::
|
||||||
$(CXX) $(CXXFLAGS) $<
|
$(CXX) $(CXXFLAGS) $<
|
||||||
|
|
||||||
|
{$(SOURCE_PATH)\src\corelib\serialization}.cpp{}.obj::
|
||||||
|
$(CXX) $(CXXFLAGS) $<
|
||||||
|
|
||||||
{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj::
|
{$(SOURCE_PATH)\src\corelib\tools}.cpp{}.obj::
|
||||||
$(CXX) $(CXXFLAGS) $<
|
$(CXX) $(CXXFLAGS) $<
|
||||||
|
|
||||||
{$(SOURCE_PATH)\src\corelib\xml}.cpp{}.obj::
|
|
||||||
$(CXX) $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
{$(SOURCE_PATH)\src\corelib\json}.cpp{}.obj::
|
|
||||||
$(CXX) $(CXXFLAGS) $<
|
|
||||||
|
|
||||||
# Make sure qstring_compat.obj and qlibraryinfo.obj aren't compiled with PCH enabled
|
# Make sure qstring_compat.obj and qlibraryinfo.obj aren't compiled with PCH enabled
|
||||||
qstring_compat.obj: $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
|
qstring_compat.obj: $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
|
||||||
$(CXX) -c $(CXXFLAGS_BARE) $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
|
$(CXX) -c $(CXXFLAGS_BARE) $(SOURCE_PATH)\src\corelib\tools\qstring_compat.cpp
|
||||||
|
@ -16,9 +16,8 @@ VPATH += \
|
|||||||
../src/corelib/kernel \
|
../src/corelib/kernel \
|
||||||
../src/corelib/codecs \
|
../src/corelib/codecs \
|
||||||
../src/corelib/plugin \
|
../src/corelib/plugin \
|
||||||
../src/corelib/xml \
|
|
||||||
../src/corelib/io \
|
../src/corelib/io \
|
||||||
../src/corelib/json \
|
../src/corelib/serialization \
|
||||||
../tools/shared/windows
|
../tools/shared/windows
|
||||||
|
|
||||||
INCLUDEPATH += . \
|
INCLUDEPATH += . \
|
||||||
|
@ -35,13 +35,12 @@ include(thread/thread.pri)
|
|||||||
include(tools/tools.pri)
|
include(tools/tools.pri)
|
||||||
include(io/io.pri)
|
include(io/io.pri)
|
||||||
include(itemmodels/itemmodels.pri)
|
include(itemmodels/itemmodels.pri)
|
||||||
include(json/json.pri)
|
|
||||||
include(plugin/plugin.pri)
|
include(plugin/plugin.pri)
|
||||||
include(kernel/kernel.pri)
|
include(kernel/kernel.pri)
|
||||||
include(codecs/codecs.pri)
|
include(codecs/codecs.pri)
|
||||||
|
include(serialization/serialization.pri)
|
||||||
include(statemachine/statemachine.pri)
|
include(statemachine/statemachine.pri)
|
||||||
include(mimetypes/mimetypes.pri)
|
include(mimetypes/mimetypes.pri)
|
||||||
include(xml/xml.pri)
|
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
LIBS_PRIVATE += -lws2_32
|
LIBS_PRIVATE += -lws2_32
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
HEADERS += \
|
HEADERS += \
|
||||||
io/qabstractfileengine_p.h \
|
io/qabstractfileengine_p.h \
|
||||||
io/qbuffer.h \
|
io/qbuffer.h \
|
||||||
io/qdatastream.h \
|
|
||||||
io/qdatastream_p.h \
|
|
||||||
io/qdataurl_p.h \
|
io/qdataurl_p.h \
|
||||||
io/qdebug.h \
|
io/qdebug.h \
|
||||||
io/qdebug_p.h \
|
io/qdebug_p.h \
|
||||||
@ -22,8 +20,6 @@ HEADERS += \
|
|||||||
io/qlockfile.h \
|
io/qlockfile.h \
|
||||||
io/qlockfile_p.h \
|
io/qlockfile_p.h \
|
||||||
io/qnoncontiguousbytedevice_p.h \
|
io/qnoncontiguousbytedevice_p.h \
|
||||||
io/qtextstream.h \
|
|
||||||
io/qtextstream_p.h \
|
|
||||||
io/qtemporarydir.h \
|
io/qtemporarydir.h \
|
||||||
io/qtemporaryfile.h \
|
io/qtemporaryfile.h \
|
||||||
io/qtemporaryfile_p.h \
|
io/qtemporaryfile_p.h \
|
||||||
@ -57,7 +53,6 @@ HEADERS += \
|
|||||||
SOURCES += \
|
SOURCES += \
|
||||||
io/qabstractfileengine.cpp \
|
io/qabstractfileengine.cpp \
|
||||||
io/qbuffer.cpp \
|
io/qbuffer.cpp \
|
||||||
io/qdatastream.cpp \
|
|
||||||
io/qdataurl.cpp \
|
io/qdataurl.cpp \
|
||||||
io/qtldurl.cpp \
|
io/qtldurl.cpp \
|
||||||
io/qdebug.cpp \
|
io/qdebug.cpp \
|
||||||
@ -71,7 +66,6 @@ SOURCES += \
|
|||||||
io/qlockfile.cpp \
|
io/qlockfile.cpp \
|
||||||
io/qnoncontiguousbytedevice.cpp \
|
io/qnoncontiguousbytedevice.cpp \
|
||||||
io/qstorageinfo.cpp \
|
io/qstorageinfo.cpp \
|
||||||
io/qtextstream.cpp \
|
|
||||||
io/qtemporarydir.cpp \
|
io/qtemporarydir.cpp \
|
||||||
io/qtemporaryfile.cpp \
|
io/qtemporaryfile.cpp \
|
||||||
io/qresource.cpp \
|
io/qresource.cpp \
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
HEADERS += \
|
|
||||||
json/qjson_p.h \
|
|
||||||
json/qjsondocument.h \
|
|
||||||
json/qjsonobject.h \
|
|
||||||
json/qjsonvalue.h \
|
|
||||||
json/qjsonarray.h \
|
|
||||||
json/qjsonwriter_p.h \
|
|
||||||
json/qjsonparser_p.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
json/qjson.cpp \
|
|
||||||
json/qjsondocument.cpp \
|
|
||||||
json/qjsonobject.cpp \
|
|
||||||
json/qjsonarray.cpp \
|
|
||||||
json/qjsonvalue.cpp \
|
|
||||||
json/qjsonwriter.cpp \
|
|
||||||
json/qjsonparser.cpp
|
|
30
src/corelib/serialization/serialization.pri
Normal file
30
src/corelib/serialization/serialization.pri
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# Qt data formats core module
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
serialization/qdatastream.h \
|
||||||
|
serialization/qdatastream_p.h \
|
||||||
|
serialization/qjson_p.h \
|
||||||
|
serialization/qjsondocument.h \
|
||||||
|
serialization/qjsonobject.h \
|
||||||
|
serialization/qjsonvalue.h \
|
||||||
|
serialization/qjsonarray.h \
|
||||||
|
serialization/qjsonwriter_p.h \
|
||||||
|
serialization/qjsonparser_p.h \
|
||||||
|
serialization/qtextstream.h \
|
||||||
|
serialization/qtextstream_p.h \
|
||||||
|
serialization/qxmlstream.h \
|
||||||
|
serialization/qxmlstream_p.h \
|
||||||
|
serialization/qxmlutils_p.h
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
serialization/qdatastream.cpp \
|
||||||
|
serialization/qjson.cpp \
|
||||||
|
serialization/qjsondocument.cpp \
|
||||||
|
serialization/qjsonobject.cpp \
|
||||||
|
serialization/qjsonarray.cpp \
|
||||||
|
serialization/qjsonvalue.cpp \
|
||||||
|
serialization/qjsonwriter.cpp \
|
||||||
|
serialization/qjsonparser.cpp \
|
||||||
|
serialization/qtextstream.cpp \
|
||||||
|
serialization/qxmlstream.cpp \
|
||||||
|
serialization/qxmlutils.cpp
|
@ -1,10 +0,0 @@
|
|||||||
# Qt xml core module
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
xml/qxmlstream.h \
|
|
||||||
xml/qxmlstream_p.h \
|
|
||||||
xml/qxmlutils_p.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
xml/qxmlstream.cpp \
|
|
||||||
xml/qxmlutils.cpp
|
|
@ -32,7 +32,6 @@ SOURCES += \
|
|||||||
../../corelib/global/qrandom.cpp \
|
../../corelib/global/qrandom.cpp \
|
||||||
../../corelib/io/qabstractfileengine.cpp \
|
../../corelib/io/qabstractfileengine.cpp \
|
||||||
../../corelib/io/qbuffer.cpp \
|
../../corelib/io/qbuffer.cpp \
|
||||||
../../corelib/io/qdatastream.cpp \
|
|
||||||
../../corelib/io/qdebug.cpp \
|
../../corelib/io/qdebug.cpp \
|
||||||
../../corelib/io/qdir.cpp \
|
../../corelib/io/qdir.cpp \
|
||||||
../../corelib/io/qdiriterator.cpp \
|
../../corelib/io/qdiriterator.cpp \
|
||||||
@ -47,7 +46,6 @@ SOURCES += \
|
|||||||
../../corelib/io/qresource.cpp \
|
../../corelib/io/qresource.cpp \
|
||||||
../../corelib/io/qtemporarydir.cpp \
|
../../corelib/io/qtemporarydir.cpp \
|
||||||
../../corelib/io/qtemporaryfile.cpp \
|
../../corelib/io/qtemporaryfile.cpp \
|
||||||
../../corelib/io/qtextstream.cpp \
|
|
||||||
../../corelib/io/qsavefile.cpp \
|
../../corelib/io/qsavefile.cpp \
|
||||||
../../corelib/io/qstandardpaths.cpp \
|
../../corelib/io/qstandardpaths.cpp \
|
||||||
../../corelib/io/qloggingcategory.cpp \
|
../../corelib/io/qloggingcategory.cpp \
|
||||||
@ -58,6 +56,17 @@ SOURCES += \
|
|||||||
../../corelib/kernel/qvariant.cpp \
|
../../corelib/kernel/qvariant.cpp \
|
||||||
../../corelib/kernel/qsystemerror.cpp \
|
../../corelib/kernel/qsystemerror.cpp \
|
||||||
../../corelib/plugin/quuid.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/qbitarray.cpp \
|
||||||
../../corelib/tools/qbytearray.cpp \
|
../../corelib/tools/qbytearray.cpp \
|
||||||
../../corelib/tools/qarraydata.cpp \
|
../../corelib/tools/qarraydata.cpp \
|
||||||
@ -84,15 +93,6 @@ SOURCES += \
|
|||||||
../../corelib/tools/qstringlist.cpp \
|
../../corelib/tools/qstringlist.cpp \
|
||||||
../../corelib/tools/qversionnumber.cpp \
|
../../corelib/tools/qversionnumber.cpp \
|
||||||
../../corelib/tools/qvsnprintf.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/dom/qdom.cpp \
|
||||||
../../xml/sax/qxml.cpp
|
../../xml/sax/qxml.cpp
|
||||||
|
|
||||||
|
@ -9,10 +9,9 @@ SUBDIRS = \
|
|||||||
global \
|
global \
|
||||||
io \
|
io \
|
||||||
itemmodels \
|
itemmodels \
|
||||||
json \
|
|
||||||
mimetypes \
|
mimetypes \
|
||||||
plugin \
|
plugin \
|
||||||
|
serialization \
|
||||||
statemachine \
|
statemachine \
|
||||||
thread \
|
thread \
|
||||||
tools \
|
tools
|
||||||
xml
|
|
||||||
|
@ -2,7 +2,6 @@ TEMPLATE=subdirs
|
|||||||
SUBDIRS=\
|
SUBDIRS=\
|
||||||
qabstractfileengine \
|
qabstractfileengine \
|
||||||
qbuffer \
|
qbuffer \
|
||||||
qdatastream \
|
|
||||||
qdataurl \
|
qdataurl \
|
||||||
qdebug \
|
qdebug \
|
||||||
qdir \
|
qdir \
|
||||||
@ -30,19 +29,16 @@ SUBDIRS=\
|
|||||||
qstorageinfo \
|
qstorageinfo \
|
||||||
qtemporarydir \
|
qtemporarydir \
|
||||||
qtemporaryfile \
|
qtemporaryfile \
|
||||||
qtextstream \
|
|
||||||
qurl \
|
qurl \
|
||||||
qurlinternal \
|
qurlinternal \
|
||||||
qurlquery \
|
qurlquery \
|
||||||
|
|
||||||
!qtHaveModule(gui): SUBDIRS -= \
|
!qtHaveModule(gui): SUBDIRS -= \
|
||||||
qdatastream \
|
|
||||||
qsettings
|
qsettings
|
||||||
|
|
||||||
!qtHaveModule(network): SUBDIRS -= \
|
!qtHaveModule(network): SUBDIRS -= \
|
||||||
qiodevice \
|
qiodevice \
|
||||||
qprocess \
|
qprocess
|
||||||
qtextstream
|
|
||||||
|
|
||||||
!qtHaveModule(concurrent): SUBDIRS -= \
|
!qtHaveModule(concurrent): SUBDIRS -= \
|
||||||
qdebug \
|
qdebug \
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user