diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2019-05-24 14:27:48 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-30 11:52:48 +0100 |
| commit | 5357231c0a10eef558cc6aebfd172048dc010a96 (patch) | |
| tree | 47d13d107665105bc93734c064b11e47ad5392e2 /qmake | |
| parent | 1299a2330ae14a6a901f574ea01fc63715e1b87d (diff) | |
Make QList an alias to QVector
This is almost 100% source compatible with Qt 5. Exceptions are
* Stability of references for large or non movable types
* taking a PMF for types that are now overloaded with r-value references
in QVector
* The missing prepend optimization in QVector (that is still planned
to come for Qt 6)
Change-Id: I96d44553304dd623def9c70d6fea8fa2fb0373b0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 6 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index da0fccb834..2e4958dcd7 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -29,7 +29,7 @@ QOBJS = \ quuid.o \ qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \ qcalendar.o qgregoriancalendar.o qromancalendar.o \ - qcryptographichash.o qdatetime.o qhash.o qlist.o \ + qcryptographichash.o qdatetime.o qhash.o \ qlocale.o qlocale_tools.o qmap.o qregexp.o qringbuffer.o \ qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \ qvsnprintf.o qxmlstream.o qxmlutils.o \ @@ -125,7 +125,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/qlist.cpp \ $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \ $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \ @@ -371,9 +370,6 @@ qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $< - qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 74fb80e337..1c2692d143 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -90,7 +90,6 @@ QTOBJS= \ qiodevice.obj \ qringbuffer.obj \ qdebug.obj \ - qlist.obj \ qlocale.obj \ qlocale_tools.obj \ qlocale_win.obj \ |