diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmake/Makefile.unix | 3 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 1 | ||||
| -rw-r--r-- | qmake/qmake.pro | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2a64d49c54..9e2c7b513c 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -112,7 +112,7 @@ qt_add_tool(${target_name} ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.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/tools/qmap.cpp ../src/corelib/tools/qmap.h + ../src/corelib/tools/qmap.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 75d3fe3ca7..da49bb3177 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 qringbuffer.o \ + qlocale.o qlocale_tools.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 \ @@ -129,7 +129,6 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \ $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \ $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \ $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_auto_possess.c \ diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 05ea1fb338..1cd439556f 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -99,7 +99,6 @@ QTOBJS= \ qlocale_win.obj \ qversionnumber.obj \ qmalloc.obj \ - qmap.obj \ qoperatingsystemversion.obj \ qoperatingsystemversion_win.obj \ qromancalendar.obj \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 98eb3d1f6f..2cfa7c81a8 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -149,7 +149,6 @@ SOURCES += \ qlocale_tools.cpp \ qlogging.cpp \ qmalloc.cpp \ - qmap.cpp \ qmetatype.cpp \ qnumeric.cpp \ qregularexpression.cpp \ |