diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
| commit | f255b1e8e297e7e1363921580007145cff574e0d (patch) | |
| tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /qmake/Makefile.unix | |
| parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
| parent | bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I54741635460bb2d8f3fd0be535ee1968d6c442bb
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 68f173cd1b..e895feaef4 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -28,6 +28,7 @@ QOBJS = \ qmetatype.o qsystemerror.o qvariant.o \ quuid.o \ qarraydata.o qbitarray.o qbytearray.o qbytearraymatcher.o \ + qcalendar.o qgregoriancalendar.o qromancalendar.o \ qcryptographichash.o qdatetime.o qhash.o qlist.o \ qlocale.o qlocale_tools.o qmap.o qregexp.o qringbuffer.o \ qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \ @@ -114,7 +115,10 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/text/qstring.cpp \ $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp \ $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp \ + $(SOURCE_PATH)/src/corelib/time/qcalendar.cpp \ $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp \ + $(SOURCE_PATH)/src/corelib/time/qgregoriancalendar.cpp \ + $(SOURCE_PATH)/src/corelib/time/qromancalendar.cpp \ $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \ $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \ $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ @@ -428,6 +432,15 @@ qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp qdatetime.o: $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qcalendar.o: $(SOURCE_PATH)/src/corelib/time/qcalendar.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + +qgregoriancalendar.o: $(SOURCE_PATH)/src/corelib/time/qgregoriancalendar.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + +qromancalendar.o: $(SOURCE_PATH)/src/corelib/time/qromancalendar.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + qstringlist.o: $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< |