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

remove duplicate -L flags in findLibraries()

Browse Source 
unlike duplicated -l options, duplicated -L options are really redundant.

Change-Id: I4fa42d8ee2f10c6e6263457d9bb97291e13685ef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-13 13:09:30 +02:00 committed by Qt by Nokia
parent a699fa520f
commit 14bdff32e2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/generators/unix/unixmake.cpp
View File

@ -476,15 +476,18 @@ UnixMakefileGenerator::findLibraries()
const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
for(int i = 0; !lflags[i].isNull(); i++) { for(int i = 0; !lflags[i].isNull(); i++) {
QStringList &l = project->values(lflags[i]); QStringList &l = project->values(lflags[i]);
for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { for (QStringList::Iterator it = l.begin(); it != l.end(); ) {
bool do_suffix = true; bool do_suffix = true;
QString stub, dir, extn, opt = (*it).trimmed(); QString stub, dir, extn, opt = (*it).trimmed();
if(opt.startsWith("-")) { if(opt.startsWith("-")) {
if(opt.startsWith("-L")) { if(opt.startsWith("-L")) {
QString lib = opt.mid(2); QString lib = opt.mid(2);
QMakeLocalFileName f(lib); QMakeLocalFileName f(lib);
if(!libdirs.contains(f)) if (libdirs.contains(f)) {
libdirs.append(f); it = l.erase(it);
continue;
}
libdirs.append(f);
if (!libArg.isEmpty()) if (!libArg.isEmpty())
*it = libArg + lib; *it = libArg + lib;
} else if(opt.startsWith("-l")) { } else if(opt.startsWith("-l")) {
@ -560,6 +563,7 @@ UnixMakefileGenerator::findLibraries()
} }
} }
} }
++it;
} }
} }
return false; return false;