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 --- src/tools/bootstrap/bootstrap.pro | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/tools/bootstrap') diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index bfd199a8ba..c212ccbb6f 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -138,11 +138,8 @@ win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \ mac { SOURCES += \ ../../corelib/kernel/qcoreapplication_mac.cpp \ - ../../corelib/kernel/qcore_mac.cpp - - OBJECTIVE_SOURCES += \ + ../../corelib/kernel/qcore_mac.mm \ ../../corelib/global/qoperatingsystemversion_darwin.mm \ - ../../corelib/kernel/qcore_mac_objc.mm \ ../../corelib/kernel/qcore_foundation.mm LIBS += -framework Foundation -- cgit v1.2.3