1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: remove system framework path check from writePkgConfigFile()

Browse Source 
/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 <oswald.buddenhagen@qt.io>
This commit is contained in:
Morten Johan Sørvig 2018-06-19 12:00:48 +02:00
parent b03a11301b
commit 3b4211ec47
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -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");