diff options
| author | axis <qt-info@nokia.com> | 2010-07-30 07:22:17 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-08-03 07:27:47 (GMT) |
| commit | 6e449acfb98b31fbbdd44830af61376db45fdd8c (patch) | |
| tree | 8f4f95808ad821a2497a3f4c5631af8c758556e7 /mkspecs/features | |
| parent | ee9d985f1a3d7071a83fc025c8b8d163effffbc0 (diff) | |
| download | Qt-6e449acfb98b31fbbdd44830af61376db45fdd8c.zip Qt-6e449acfb98b31fbbdd44830af61376db45fdd8c.tar.gz Qt-6e449acfb98b31fbbdd44830af61376db45fdd8c.tar.bz2 | |
Included libstdcppv5 support for the makefile build system.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 3091fce..2a3bce4 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -15,18 +15,24 @@ 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 -STL_LIB = -llibstdcppv5.dll - # STDCPP turns on standard C++ new behaviour (ie. throwing new) -STL_MMP_RULE = "STDCPP" +use_libstdcppv5 = true # Fall back to old implementation if that is the only one that is found exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcpp.dso)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { !exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { - STL_LIB = -llibstdcpp.dll - STL_MMP_RULE = + use_libstdcppv5 = false } } -LIBS *= $$STL_LIB -MMP_RULES *= $$STL_MMP_RULE +equals(use_libstdcppv5, true) { + LIBS *= -llibstdcppv5.dll + symbian-abld|symbian-sbsv2 { + MMP_RULES *= "STDCPP" + } else { + DEFINES *= __SYMBIAN_STDCPP_SUPPORT__ + LIBS *= -lstdnew.dll + } +} else { + LIBS *= -llibstdcpp.dll +} |