From 952952bea94a3eb7374c94d29736c3d6e233b71e Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 27 Nov 2009 16:14:58 +0100 Subject: Fixed a bug in the LIBS mangling on Symbian. Previously, if one entry appeared more than once it would receive several extensions. --- mkspecs/symbian/linux-armcc/features/qt.prf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mkspecs/symbian/linux-armcc/features/qt.prf b/mkspecs/symbian/linux-armcc/features/qt.prf index efe7fbd..ec7cbe0 100644 --- a/mkspecs/symbian/linux-armcc/features/qt.prf +++ b/mkspecs/symbian/linux-armcc/features/qt.prf @@ -7,15 +7,22 @@ isEmpty(DESTDIR) { for(libraries, LIBS) { isFullName = $$find(libraries, \.) isEmpty(isFullName) { - LIBS = $$replace(LIBS, "$$libraries", "$${libraries}.dso") + newLIBS += "$${libraries}.dso" + } else { + newLIBS += "$${libraries}" } } +LIBS = $$newLIBS +newLIBS = for(libraries, QMAKE_LIBS) { isFullName = $$find(libraries, \.) isEmpty(isFullName) { - QMAKE_LIBS = $$replace(QMAKE_LIBS, "$$libraries", "$${libraries}.dso") + newLIBS += "$${libraries}.dso" + } else { + newLIBS += "$${libraries}" } } +QMAKE_LIBS = $$newLIBS # This needs to be done after the above LIBS mangling. include(../platformlibs.conf) -- cgit v0.12