From b2cf158459da1647d86579a28f1435334aa85e3d Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Mon, 12 Oct 2009 12:45:58 +0200 Subject: Prevent cross-talk between different Qt builds on OS X. /Library/Frameworks/ is hardcoded as a .prl file lookup path, which sometimes wreaks havoc when depot builds pick up settings and binaries from an installed binary package. Remove /Library/Frameworks from the qmake sources. The binary package build script already adds -F /Library/Frameworks explicitly. /Library/Frameworks is still kept as a default _framework_ search path, since it does not seem to cause trouble, and people may be relying on that path being searched by default. --- qmake/generators/unix/unixmake.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index faa6415..ec3b5d8 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -544,7 +544,6 @@ UnixMakefileGenerator::processPrlFiles() { QList libdirs, frameworkdirs; frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks")); - frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks")); const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", QString() }; for(int i = 0; !lflags[i].isNull(); i++) { QStringList &l = project->values(lflags[i]); -- cgit v0.12