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

Ensure QMAKE_PRL_LIBS is a unique list.

Browse Source 
Windows static builds currently fail due to overlong command
link lines containing multiple occurrences of base libraries.

Task-number: QTBUG-28131
Change-Id: Ibf7f551fc98c879111b32b27a16f4e96260743c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Friedemann Kleint 2012-11-26 12:27:53 +01:00 committed by The Qt Project
parent 3279ed584e
commit 2d795717fc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/meta.cpp
View File

@ -187,7 +187,11 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
(*lit) = conf->first("QMAKE_LFLAGS_RPATH") + (*lit).mid(2); (*lit) = conf->first("QMAKE_LFLAGS_RPATH") + (*lit).mid(2);
} }
} }
vars["QMAKE_PRL_LIBS"] += lst; ProStringList &prlLibs = vars["QMAKE_PRL_LIBS"];
foreach (const ProString &s, lst) {
prlLibs.removeAll(s);
prlLibs.append(s);
}
} }
} }
return true; return true;