summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.unix
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2020-03-11 11:46:59 +0100
committerTor Arne Vestbø <torarnv@gmail.com>2020-03-12 06:07:35 +0100
commit5f940253bfde4b5336ff13be063f64bd1c1dbe49 (patch)
tree0e3f43543335679b59edde6989aad1738a9a043c /qmake/Makefile.unix
parent739382a1bf2e5c8bd9b006d1f83d04a6add0eb3e (diff)
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 <timur.pocheptsov@qt.io>
Diffstat (limited to 'qmake/Makefile.unix')
-rw-r--r--qmake/Makefile.unix7
1 files changed, 1 insertions, 6 deletions
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) $<