diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-19 12:00:48 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-25 10:24:35 +0000 |
| commit | 3b4211ec47c98c09e2b96c77df1f8f0833c92793 (patch) | |
| tree | c5dfe43cbefebf52dac14a802edaf158204cb597 /qmake | |
| parent | b03a11301b6c2d0b4a2c1ab529e28c2ab9e7abac (diff) | |
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 <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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"); |