diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-19 10:38:30 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-19 11:04:05 (GMT) |
| commit | 1f56953fca1a38b31734ce8a87c01c85f1f0f901 (patch) | |
| tree | 0f59d3b6731c680533338e579336390d6e0116ea /mkspecs/features | |
| parent | cd79ee107935fcc6f2c8bd71ab61729a6198c495 (diff) | |
| download | Qt-1f56953fca1a38b31734ce8a87c01c85f1f0f901.zip Qt-1f56953fca1a38b31734ce8a87c01c85f1f0f901.tar.gz Qt-1f56953fca1a38b31734ce8a87c01c85f1f0f901.tar.bz2 | |
Fixed libstdcpp.dll version autodetection for Symbian
Libstdcpp.dll version autodetection was broken for clean builds,
so made it default for new version when neither new or old can be
detected.
Task-number: QT-1171
Reviewed-by: Janne Anttila
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index e21ee5c..85c758a 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -15,11 +15,18 @@ INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new -exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { - LIBS *= -llibstdcppv5.dll +STL_LIB = -llibstdcppv5.dll - # STDCPP turns on standard C++ new behaviour (ie. throwing new) - MMP_RULES += "STDCPP" -} else { - LIBS *= -llibstdcpp.dll +# STDCPP turns on standard C++ new behaviour (ie. throwing new) +STL_MMP_RULE = "STDCPP" + +# Fall back to old implementation if that is the only one that is found +exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcpp.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { + !exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { + STL_LIB = -llibstdcpp.dll + STL_MMP_RULE = + } } + +LIBS *= $$STL_LIB +MMP_RULES *= $$STL_MMP_RULE |