From 7870eeb33d9a16bf28a8e0d6d5bbfd4473b54b91 Mon Sep 17 00:00:00 2001 From: Iain Date: Wed, 16 Sep 2009 11:33:10 +0100 Subject: Remove unnecessary lines from MMP files when using libstdcppv5.dll SBSv1 has also been updated to define the appropriate macros and add the required library statements, so all that is needed is the STDCPP keyword Reviewed-by: mread --- mkspecs/features/symbian/stl.prf | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index b4dbc9c..8892d2a 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -18,19 +18,8 @@ INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll ) { LIBS *= -llibstdcppv5.dll - # STDCPP turns on standard C++ new behaviour in SBSv2 + # STDCPP turns on standard C++ new behaviour (ie. throwing new) MMP_RULES += "STDCPP" - - # defining __SYMBIAN_STDCPP_SUPPORT__ turns on standard C++ new behaviour pre SBSv2 - DEFINES += "__SYMBIAN_STDCPP_SUPPORT__" - - # operator new is actually supplied in stdnew.lib for hardware builds - eabiStdNewLibBlock = \ - "$${LITERAL_HASH}ifdef EABI" \ - "LIBRARY stdnew.lib" \ - "$${LITERAL_HASH}endif" - - MMP_RULES += eabiStdNewLibBlock } else { LIBS *= -llibstdcpp.dll } -- cgit v0.12