diff options
-rw-r--r-- | qmake/CMakeLists.txt | 1 | ||||
-rw-r--r-- | qmake/Makefile.unix | 10 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
-rw-r--r-- | qmake/qmake.pro | 4 |
4 files changed, 1 insertions, 16 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index fa7d50f234..41be3f29e1 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -78,7 +78,6 @@ qt_add_tool(qmake # special case ../src/corelib/serialization/qjsonvalue.cpp ../src/corelib/serialization/qjsonvalue.h ../src/corelib/serialization/qjsonwriter_p.h ../src/corelib/serialization/qtextstream.cpp ../src/corelib/serialization/qtextstream.h - ../src/corelib/serialization/qxmlstream.cpp ../src/corelib/serialization/qxmlstream.h ../src/corelib/serialization/qxmlutils.cpp ../src/corelib/serialization/qxmlutils_p.h ../src/corelib/tools/qarraydata.cpp ../src/corelib/tools/qarraydata.h ../src/corelib/tools/qarraydataops.h diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index c0b6704351..660a21daa0 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -32,7 +32,7 @@ QOBJS = \ qcryptographichash.o qdatetime.o qhash.o \ qlocale.o qlocale_tools.o qmap.o qregularexpression.o qregexp.o qringbuffer.o \ qstringbuilder.o qstring.o qstringconverter.o qstringlist.o qversionnumber.o \ - qvsnprintf.o qxmlstream.o qxmlutils.o \ + qvsnprintf.o \ pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_config.o \ pcre2_context.o pcre2_dfa_match.o pcre2_error.o pcre2_extuni.o \ pcre2_find_bracket.o pcre2_jit_compile.o pcre2_maketables.o pcre2_match.o \ @@ -110,8 +110,6 @@ DEPEND_SRC = \ $(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/text/qbytearray.cpp \ $(SOURCE_PATH)/src/corelib/text/qbytearraylist.cpp \ $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp \ @@ -526,12 +524,6 @@ qjsonobject.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp 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) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index df47dacd15..e33bdcdb83 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -117,8 +117,6 @@ QTOBJS= \ qvariant.obj \ qsettings_win.obj \ qmetatype.obj \ - qxmlstream.obj \ - qxmlutils.obj \ qnumeric.obj \ qlogging.obj \ qcborstreamwriter.obj \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro index fcd1c17dcf..9318790371 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -168,8 +168,6 @@ SOURCES += \ qvariant.cpp \ qversionnumber.cpp \ qvsnprintf.cpp \ - qxmlstream.cpp \ - qxmlutils.cpp HEADERS += \ qabstractfileengine_p.h \ @@ -227,8 +225,6 @@ HEADERS += \ quuid.h \ qvector.h \ qversionnumber.h \ - qxmlstream.h \ - qxmlutils_p.h include(../src/3rdparty/pcre2/pcre2.pri) |