From ad5e583956d839e0022c29add9fe066a2b7d9563 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 25 Jul 2012 13:51:26 +0200 Subject: don't actually resolve frameworks in findLibraries() the code wouldn't actually *do* anything with them, because it was completely broken. didn't seem to hurt, so just remove it. we still need to parse -framework, though, so we don't do funny things with its possible argument. Change-Id: Ia3266538612d3314a72f4965ee9c1ea2d3046ac9 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- qmake/generators/unix/unixmake.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 763aabbd7c..63a7a5b8cd 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -474,14 +474,11 @@ UnixMakefileGenerator::findLibraries() QString libArg = project->first("QMAKE_L_FLAG"); if (libArg == "-L") libArg.clear(); - QList libdirs, frameworkdirs; - frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks")); - frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks")); + QList libdirs; const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; for(int i = 0; !lflags[i].isNull(); i++) { QStringList &l = project->values(lflags[i]); for (QStringList::Iterator it = l.begin(); it != l.end(); ) { - bool do_suffix = true; QString stub, dir, extn, opt = (*it).trimmed(); if(opt.startsWith("-")) { if(opt.startsWith("-L")) { @@ -500,19 +497,10 @@ UnixMakefileGenerator::findLibraries() } else { stub = opt.mid(2); } - } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-F")) { - frameworkdirs.append(QMakeLocalFileName(opt.right(opt.length()-2))); } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) { - if(opt.length() > 11) { - opt = opt.mid(11); - } else { + if (opt.length() == 10) ++it; - opt = (*it); - } - do_suffix = false; - extn = ""; - dir = "/System/Library/Frameworks/" + opt + ".framework/"; - stub = opt; + // Skip } } else { extn = dir = ""; @@ -529,7 +517,7 @@ UnixMakefileGenerator::findLibraries() } } if(!stub.isEmpty()) { - if(do_suffix && !project->isEmpty("QMAKE_" + stub.toUpper() + "_SUFFIX")) + if (!project->isEmpty("QMAKE_" + stub.toUpper() + "_SUFFIX")) stub += project->first("QMAKE_" + stub.toUpper() + "_SUFFIX"); bool found = false; QStringList extens; -- cgit v1.2.3