From 84af8f9b0bca0e615d45d600834bca31ca66059c Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 27 Feb 2019 13:52:57 +0100
Subject: [PATCH] Fix build of qmake on macOS

Two changes were needed:
- correctly link against frameworks
- use qcore_mac.cpp instead of qcore_mac_objc.mm, because we don't
  link against AppKit

Change-Id: Ibd9d6d367a7fcdf7dce277c1b06d36c491294eeb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 qmake/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 223eefaa57..14211480dd 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -1,5 +1,9 @@
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs" DESTINATION ${INSTALL_DATADIR})
 
+find_library(FWApplicationServices ApplicationServices)
+find_library(FWCoreServices CoreServices)
+find_library(FWFoundation Foundation)
+
 add_qt_tool(qmake
     SOURCES
         meta.cpp
@@ -123,13 +127,11 @@ extend_target(qmake CONDITION UNIX
 extend_target(qmake CONDITION APPLE_OSX
     SOURCES
         ${PROJECT_SOURCE_DIR}/src/corelib/kernel/qcore_foundation.mm
-        ${PROJECT_SOURCE_DIR}/src/corelib/kernel/qcore_mac_objc.mm
+        ${PROJECT_SOURCE_DIR}/src/corelib/kernel/qcore_mac.cpp
         ${PROJECT_SOURCE_DIR}/src/corelib/global/qoperatingsystemversion_darwin.mm
         ${PROJECT_SOURCE_DIR}/src/corelib/io/qsettings_mac.cpp
     LIBRARIES
-        -framework ApplicationServices
-        -framework CoreServices
-        -framework Foundation
+        ${FWApplicationServices} ${FWCoreServices} ${FWFoundation}
 )
 # TODO: Windows support, cf. qmake.pro