diff options
| author | axis <qt-info@nokia.com> | 2009-11-27 15:14:58 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-11 10:27:39 (GMT) |
| commit | 952952bea94a3eb7374c94d29736c3d6e233b71e (patch) | |
| tree | c236cb83ff50ffb3051d0423b644f25afdbc132f /mkspecs | |
| parent | f722cae67b412404d253b5794f638c271fb1eea8 (diff) | |
| download | Qt-952952bea94a3eb7374c94d29736c3d6e233b71e.zip Qt-952952bea94a3eb7374c94d29736c3d6e233b71e.tar.gz Qt-952952bea94a3eb7374c94d29736c3d6e233b71e.tar.bz2 | |
Fixed a bug in the LIBS mangling on Symbian.
Previously, if one entry appeared more than once it would receive
several extensions.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/qt.prf | 11 |
1 files 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) |