From a6b697ca13945a174cff9f3e9b1af1cf61c0bea5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 12 Dec 2017 18:32:19 -0800 Subject: 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 Reviewed-by: Lars Knoll --- qmake/Makefile.unix | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'qmake/Makefile.unix') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 1da4b3727f..426387f0c2 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -77,7 +77,6 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/global/qrandom.cpp \ $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.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/qdir.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/qsettings.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/qmetatype.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qvariant.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/qbitarray.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/qversionnumber.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 and QTSRCS2 come from Makefile.unix.* (concatenated with this # by configure); QTSRCS2 may include *.mm entries on macOS. @@ -256,9 +256,6 @@ projectgenerator.o: $(QMKSRC)/generators/projectgenerator.cpp $(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 $(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 $(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 $(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 $(CXX) -c -o $@ $(CXXFLAGS) $< -qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp +qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp +qdatastream.o: $(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp +qjson.o: $(SOURCE_PATH)/src/corelib/serialization/qjson.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp +qjsondocument.o: $(SOURCE_PATH)/src/corelib/serialization/qjsondocument.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + +qjsonparser.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonparser.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjson.o: $(SOURCE_PATH)/src/corelib/json/qjson.cpp +qjsonarray.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjsondocument.o: $(SOURCE_PATH)/src/corelib/json/qjsondocument.cpp +qjsonobject.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjsonparser.o: $(SOURCE_PATH)/src/corelib/json/qjsonparser.cpp +qjsonvalue.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonvalue.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjsonarray.o: $(SOURCE_PATH)/src/corelib/json/qjsonarray.cpp +qxmlstream.o: $(SOURCE_PATH)/src/corelib/serialization/qxmlstream.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjsonobject.o: $(SOURCE_PATH)/src/corelib/json/qjsonobject.cpp +qxmlutils.o: $(SOURCE_PATH)/src/corelib/serialization/qxmlutils.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qjsonvalue.o: $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp +qtextstream.o: $(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< # DO NOT DELETE THIS LINE -- make depend depends on it -- cgit v1.2.3