diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-06-29 16:54:15 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-07-13 10:53:23 +0200 |
| commit | 361dc074f2301b4b68435c05ccaa7279c0170776 (patch) | |
| tree | 5b22e926cae55437c46aa9507d8dd36bb252ebb0 /qmake/Makefile.unix | |
| parent | ac14858e85cfee06c1e19843b92d50e38bc969dd (diff) | |
Move QRegExp and its remaining mentions out of QtCore
Task-number: QTBUG-85235
Change-Id: Ibd6c98d952c1bb9916b64715c6430fb0d3fe3843
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 660a21daa0..75d3fe3ca7 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -30,7 +30,7 @@ QOBJS = \ qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \ qcalendar.o qgregoriancalendar.o qromancalendar.o \ qcryptographichash.o qdatetime.o qhash.o \ - qlocale.o qlocale_tools.o qmap.o qregularexpression.o qregexp.o qringbuffer.o \ + qlocale.o qlocale_tools.o qmap.o qregularexpression.o qringbuffer.o \ qstringbuilder.o qstring.o qstringconverter.o qstringlist.o qversionnumber.o \ qvsnprintf.o \ pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_config.o \ @@ -116,7 +116,6 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/text/qlocale.cpp \ $(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp \ $(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp \ - $(SOURCE_PATH)/src/corelib/text/qregexp.cpp \ $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp \ $(SOURCE_PATH)/src/corelib/text/qstringconverter.cpp \ $(SOURCE_PATH)/src/corelib/text/qstring.cpp \ @@ -449,9 +448,6 @@ qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp qregularexpression.o: $(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qregexp.o: $(SOURCE_PATH)/src/corelib/text/qregexp.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $< - qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< |