From 5f940253bfde4b5336ff13be063f64bd1c1dbe49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 11 Mar 2020 11:46:59 +0100 Subject: macOS: Merge qcore_mac cpp and mm files Files ending with .mm are Objective-C++ files, so we don't need a separate file for the C++ parts. Change-Id: I3ef52bc98291fd461b889978a538e81630d17c6e Reviewed-by: Timur Pocheptsov --- qmake/Makefile.unix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'qmake/Makefile.unix') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 325a8548cf..646f5f8494 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -37,7 +37,6 @@ QOBJS = \ $(QTOBJS) $(QTOBJS2) # QTOBJS and QTOBJS2 are populated by Makefile.unix.* as for QTSRC (see below). # Note: qlibraryinfo.o omitted deliberately - see below. -# Note: qcore_mac_objc.o is in SOURCES (see qmake.pri) but not QOBJS. #all sources, used for the depend target (please keep alphabetic in each block) DEPEND_SRC = \ @@ -92,7 +91,6 @@ 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/qcore_mac_objc.mm \ $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \ $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \ @@ -326,7 +324,7 @@ qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp +qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.mm $(CXX) -c -o $@ $(CXXFLAGS) $< qcore_unix.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_unix.cpp @@ -341,9 +339,6 @@ qoperatingsystemversion_win.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsyste qoperatingsystemversion_darwin.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm $(CXX) -c -o $@ $(CXXFLAGS) $< -qcore_mac_objc.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm - $(CXX) -c -o $@ $(CXXFLAGS) $< - qcore_foundation.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm $(CXX) -c -o $@ $(CXXFLAGS) $< -- cgit v1.2.3