summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-11-26 12:27:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-26 17:33:37 +0100
commit2d795717fc2d58862a6f4a9b9c7d97bb973c5eb8 (patch)
tree192d1b6629448aefdd3173da14fe942aaed344ee /qmake
parent3279ed584ec132b305ef2079b22952fc62511b04 (diff)
Ensure QMAKE_PRL_LIBS is a unique list.
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>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/meta.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 2a0614a9bc..e1029ffcb0 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -187,7 +187,11 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
(*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;