diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-10-12 10:45:58 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-10-12 10:45:58 (GMT) |
| commit | b2cf158459da1647d86579a28f1435334aa85e3d (patch) | |
| tree | 660ddafd8f202f01fa3847f41dfc601ac55fcf72 /qmake | |
| parent | ead7fd2fd4a4a9963335285cbe8405ac0b1da0e8 (diff) | |
| download | Qt-b2cf158459da1647d86579a28f1435334aa85e3d.zip Qt-b2cf158459da1647d86579a28f1435334aa85e3d.tar.gz Qt-b2cf158459da1647d86579a28f1435334aa85e3d.tar.bz2 | |
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.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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<QMakeLocalFileName> 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]); |