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

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>

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index e7dbc6a..bbb9dc2 100644 (file)
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -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);

diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 88832dd..ac65bbb 100644 (file)
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -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);