diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-30 13:30:52 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-08 02:18:16 +0000 |
| commit | 80c152d6898c1b8727ac14d32437b274153a7089 (patch) | |
| tree | 78d2b98bac5cd3e6a4395e8e86ce7fb68f3ec0fa /qmake | |
| parent | 3c689c4b3fd24ead8726444723536452d0e89d85 (diff) | |
Move the readlink(2) wrapper to qcore_unix.cpp
This deduplicates the code between QFileSystemEngine and QLockFile.
Change-Id: I1eba2b016de74620bfc8fffd14cd005d5fd9beaa
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix | 3 | ||||
| -rw-r--r-- | qmake/Makefile.unix.unix | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 259c5cba16..1da4b3727f 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -319,6 +319,9 @@ qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qcore_unix.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_unix.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + qoperatingsystemversion.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.unix.unix b/qmake/Makefile.unix.unix index 63eba4f5a5..e8c1cd1017 100644 --- a/qmake/Makefile.unix.unix +++ b/qmake/Makefile.unix.unix @@ -1,10 +1,12 @@ EXEEXT = QTOBJS = \ + qcore_unix.o \ qfilesystemengine_unix.o \ qfilesystemiterator_unix.o \ qfsfileengine_unix.o \ qlocale_unix.o QTSRCS = \ + $(SOURCE_PATH)/src/corelib/kernel/qcore_unix.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp \ $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp \ $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp \ |