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 | |
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')
-rw-r--r-- | qmake/.prev_CMakeLists.txt | 1 | ||||
-rw-r--r-- | qmake/CMakeLists.txt | 2 | ||||
-rw-r--r-- | qmake/Makefile.unix | 6 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 1 | ||||
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 3 | ||||
-rw-r--r-- | qmake/generators/makefile.cpp | 1 | ||||
-rw-r--r-- | qmake/main.cpp | 2 | ||||
-rw-r--r-- | qmake/qmake.pro | 2 | ||||
-rw-r--r-- | qmake/qmake_pch.h | 1 |
9 files changed, 4 insertions, 15 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 2bfc56b37f..127da3d71f 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -77,7 +77,6 @@ qt_add_tool(${target_name} ../src/corelib/text/qchar.h ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h - ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h ../src/corelib/text/qstringbuilder.cpp ../src/corelib/text/qstringbuilder.h diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 9931a2e14a..2a64d49c54 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -85,7 +85,6 @@ qt_add_tool(${target_name} ../src/corelib/text/qchar.h ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h - ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h ../src/corelib/text/qstringbuilder.cpp ../src/corelib/text/qstringbuilder.h @@ -114,7 +113,6 @@ qt_add_tool(${target_name} ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h - ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h ../src/corelib/tools/qringbuffer.cpp # special case ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h 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) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 6478c43edd..05ea1fb338 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -102,7 +102,6 @@ QTOBJS= \ qmap.obj \ qoperatingsystemversion.obj \ qoperatingsystemversion_win.obj \ - qregexp.obj \ qromancalendar.obj \ qstring.obj \ qstringconverter.obj \ diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 9b37756b79..085cd5c461 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -3535,7 +3535,8 @@ \section2 re_escape(string) Returns the \c string with every special regular expression character - escaped with a backslash. This function is a wrapper around QRegExp::escape. + escaped with a backslash. This function is a wrapper around + QRegularExpression::escape. \section2 read_registry(tree, key[, flag]) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index dfe9a1c0b9..d38b8ad9f4 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -41,7 +41,6 @@ #include <qdebug.h> #include <qbuffer.h> #include <qdatetime.h> -#include <qregexp.h> #if defined(Q_OS_UNIX) #include <unistd.h> diff --git a/qmake/main.cpp b/qmake/main.cpp index 3cd79145e5..36ba631127 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -110,7 +110,7 @@ static int doSed(int argc, char **argv) && (c == QLatin1Char('+') || c == QLatin1Char('?') || c == QLatin1Char('|') || c == QLatin1Char('{') || c == QLatin1Char('}') || c == QLatin1Char('(') || c == QLatin1Char(')'))) { - // translate sed rx to QRegExp + // translate sed rx to QRegularExpression escaped ^= 1; } if (escaped) { diff --git a/qmake/qmake.pro b/qmake/qmake.pro index ee190a820a..98eb3d1f6f 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -152,7 +152,6 @@ SOURCES += \ qmap.cpp \ qmetatype.cpp \ qnumeric.cpp \ - qregexp.cpp \ qregularexpression.cpp \ qromancalendar.cpp \ qsettings.cpp \ @@ -209,7 +208,6 @@ HEADERS += \ qmap.h \ qmetatype.h \ qnumeric.h \ - qregexp.h \ qregularexpression.h \ qromancalendar_p.h \ qstring.h \ diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h index c97c872311..fd8c78d7b6 100644 --- a/qmake/qmake_pch.h +++ b/qmake/qmake_pch.h @@ -52,7 +52,6 @@ #include <qhash.h> #include <time.h> #include <stdlib.h> -#include <qregexp.h> //#include <qdir.h> //#include "option.h" |