diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-13 17:50:05 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-12 06:14:37 +0000 |
commit | 030782e1a8c44c6be2a95c88d5a4a3a37b3b6173 (patch) | |
tree | f5508927660b4728c67a4cd7dca91e2525567c81 /qmake | |
parent | 593f022515da8a834b358b5a57779afff619b3e7 (diff) |
Move qrand() & qsrand() to qrandom.cpp
Now that we have the file, may as well consolidate
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b51d3e701c6a94
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/Makefile.unix | 10 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 768cc0248e..56b9f7e847 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -18,7 +18,7 @@ OBJS = \ #qt code (please keep in order matching DEPEND_SRC) QOBJS = \ qtextcodec.o qutfcodec.o \ - qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o \ + qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o qrandom.o \ qabstractfileengine.o qbuffer.o qdatastream.o qdebug.o \ qdir.o qdiriterator.o \ qfile.o qfiledevice.o qfileinfo.o qfilesystemengine.o \ @@ -74,6 +74,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \ $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \ $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion.cpp \ + $(SOURCE_PATH)/src/corelib/global/qrandom.cpp \ $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \ $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \ $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp \ @@ -83,6 +84,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/io/qfile.cpp \ $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp \ $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp \ + $(SOURCE_PATH)/src/corelib/global/qrandom.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp \ $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp \ @@ -276,6 +278,9 @@ qlibraryinfo_final.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(BUILD qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qrandom.o: $(SOURCE_PATH)/src/corelib/global/qrandom.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + qsettings_mac.o: $(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< @@ -297,6 +302,9 @@ qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qrandom.o: $(SOURCE_PATH)/src/corelib/global/qrandom.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qrandom.cpp + qarraydata.o: $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index f62b4cfeba..385493b582 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -109,6 +109,7 @@ QTOBJS= \ qtextstream.obj \ qdatastream.obj \ quuid.obj \ + qrandom.obj \ qsettings.obj \ qvariant.obj \ qsettings_win.obj \ |