diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-08-25 17:41:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-03 08:27:44 +0200 |
| commit | 53fde3c573737592a02c5e15ad4fe253ac3304a4 (patch) | |
| tree | 9cac35896e789c908c9f4099e5edafc3bcc663ab /qmake | |
| parent | 0e0149c64dc9b4cf46f4e8f01e5680e7ea5372c4 (diff) | |
| download | qtbase-53fde3c573737592a02c5e15ad4fe253ac3304a4.tar.gz | |
Reimplement QSequentialIterable using QMetaSequence
Change-Id: Ie721a5f0caa697c4bf15a81f3762cf79d3c54f5a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | qmake/Makefile.unix | 6 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/qmake.pro | 2 |
5 files changed, 11 insertions, 1 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 8719a3eb54..8284e9a1ad 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -58,6 +58,7 @@ qt_add_tool(${target_name} ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h ../src/corelib/io/qsettings.cpp ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h + ../src/corelib/kernel/qiterable.cpp ../src/corelib/kernel/qiterable.h ../src/corelib/kernel/qmetacontainer.cpp ../src/corelib/kernel/qmetacontainer.h ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index fc5d488c49..863ac746c6 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -66,6 +66,7 @@ qt_add_tool(${target_name} ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h ../src/corelib/io/qsettings.cpp ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h + ../src/corelib/kernel/qiterable.cpp ../src/corelib/kernel/qiterable.h ../src/corelib/kernel/qmetacontainer.cpp ../src/corelib/kernel/qmetacontainer.h ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 822150f246..ea792a7c43 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -25,7 +25,7 @@ QOBJS = \ qiodevice.o qsettings.o qtemporaryfile.o qtextstream.o \ qcborstreamwriter.o qcborvalue.o \ qjsoncbor.o qjsonarray.o qjsondocument.o qjsonobject.o qjsonparser.o qjsonvalue.o \ - qmetacontainer.o qmetatype.o qsystemerror.o qvariant.o \ + qiterable.o qmetacontainer.o qmetatype.o qsystemerror.o qvariant.o \ quuid.o \ qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \ qcalendar.o qgregoriancalendar.o qromancalendar.o \ @@ -96,6 +96,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \ $(SOURCE_PATH)/src/corelib/io/qsettings.cpp \ $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp \ + $(SOURCE_PATH)/src/corelib/kernel/qiterable.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qmetacontainer.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \ @@ -355,6 +356,9 @@ qvsnprintf.o: $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qiterable.o: $(SOURCE_PATH)/src/corelib/kernel/qiterable.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + qmetacontainer.o: $(SOURCE_PATH)/src/corelib/kernel/qmetacontainer.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 1cd439556f..9f3891bad7 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -114,6 +114,8 @@ QTOBJS= \ qsettings.obj \ qvariant.obj \ qsettings_win.obj \ + qiterable.obj \ + qmetacontainer.obj \ qmetatype.obj \ qnumeric.obj \ qlogging.obj \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 9decc10edc..4ff467f5ca 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -137,6 +137,7 @@ SOURCES += \ qgregoriancalendar.cpp \ qhash.cpp \ qiodevice.cpp \ + qiterable.cpp \ qjsonarray.cpp \ qjsoncbor.cpp \ qjsondocument.cpp \ @@ -195,6 +196,7 @@ HEADERS += \ qgregoriancalendar_p.h \ qhash.h \ qiodevice.h \ + qiterable.h \ qjson_p.h \ qjsonarray.h \ qjsondocument.h \ |