From 8ccd38d20dfe4d9b359d54d3b308fc3234b9c815 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 11 Apr 2017 14:18:42 -0700 Subject: [PATCH] Move Apple-specific -fapplication-extensions option to the mkspec The Intel compiler does not know about it. Change-Id: I523b0abacd5148b2bf08fffd14b4748c3b33c8fb Reviewed-by: Jake Petroules --- mkspecs/common/clang-mac.conf | 2 ++ mkspecs/features/mac/default_post.prf | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index 274fd73d002..cbae2e62624 100644 --- a/mkspecs/common/clang-mac.conf +++ b/mkspecs/common/clang-mac.conf @@ -9,3 +9,5 @@ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_LFLAGS += -stdlib=libc++ QMAKE_AR_LTCG = libtool -static -o + +QMAKE_CFLAGS_APPLICATION_EXTENSION = -fapplication-extension diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index cb8543254ab..2a164501bc8 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -40,10 +40,10 @@ qt { !bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD app_extension_api_only { - QMAKE_CFLAGS += -fapplication-extension - QMAKE_CXXFLAGS += -fapplication-extension - QMAKE_CXXFLAGS_PRECOMPILE += -fapplication-extension - QMAKE_LFLAGS += -fapplication-extension + QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION + QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION + QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION } macx-xcode {