From 3b4211ec47c98c09e2b96c77df1f8f0833c92793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 19 Jun 2018 12:00:48 +0200 Subject: qmake: remove system framework path check from writePkgConfigFile() /System/Library/Frameworks is now under system integrity protection and is not usable for 3rd-party framework installs. /Library/Frameworks continues to be a documented framework install locaton. Change-Id: I26f96ed57985218452ebbf9578e08f04b4e5cfd8 Reviewed-by: Oswald Buddenhagen --- qmake/generators/makefile.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 99aecdd8ce..78e6633c1c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3282,10 +3282,8 @@ MakefileGenerator::writePkgConfigFile() t << "Libs: "; QString pkgConfiglibName; if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) { - if (libDir != QLatin1String("/System/Library/Frameworks") - && libDir != QLatin1String("/Library/Frameworks")) { + if (libDir != QLatin1String("/Library/Frameworks")) t << "-F${libdir} "; - } ProString bundle; if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) bundle = project->first("QMAKE_FRAMEWORK_BUNDLE_NAME"); -- cgit v1.2.3