diff options
| author | Bill King <bking@trolltech.com> | 2010-02-22 04:43:16 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-22 04:43:16 (GMT) |
| commit | f7e44781c9fa9118e9bdac37979ab2bbb10909c8 (patch) | |
| tree | c235ffdc5195351d24a30ef5f6b8e67f2627c2d0 /mkspecs/features | |
| parent | 5162616cbfd16fce37c1f26081cbf83f02fb5831 (diff) | |
| parent | 1f10c6be975a2d36c05d926b332b869ad6339877 (diff) | |
| download | Qt-f7e44781c9fa9118e9bdac37979ab2bbb10909c8.zip Qt-f7e44781c9fa9118e9bdac37979ab2bbb10909c8.tar.gz Qt-f7e44781c9fa9118e9bdac37979ab2bbb10909c8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
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 |