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

don't use a different de-duplication algo for the library list in mingw prl files

Browse Source 
i have no idea why that was done (the commit message says "not sure why
it works elsewhere"), but it makes no sense whatsoever, specifically
doing it only on mingw. probably some workaround, as usual. the
de-duplication is broken by design anyway.

This reverts commit 7a6302c2baf6861fdaf65992b71a7676859860c2.

Change-Id: I6edecaa062570e59eccd24d50919ba132e65a403
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-03 16:49:53 +02:00 committed by Qt by Nokia
parent c54ba8c252
commit 2b4ae9651f
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/generators/win32/mingw_make.cpp
View File

@ -462,22 +462,6 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
}
}
void MingwMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
{
if (var == "QMAKE_PRL_LIBS") {
QString where = "QMAKE_LIBS";
if (!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
where = project->first("QMAKE_INTERNAL_PRL_LIBS");
QStringList &out = project->values(where);
for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
out.removeAll((*it));
out.append((*it));
}
} else {
Win32MakefileGenerator::processPrlVariable(var, l);
}
}
QStringList &MingwMakefileGenerator::findDependencies(const QString &file)
{
QStringList &aList = MakefileGenerator::findDependencies(file);

1
qmake/generators/win32/mingw_make.h
View File

@ -64,7 +64,6 @@ private:
void writeObjectsPart(QTextStream &t);
void writeBuildRulesPart(QTextStream &t);
void writeRcFilePart(QTextStream &t);
void processPrlVariable(const QString &var, const QStringList &l);
QStringList &findDependencies(const QString &file);