diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-17 07:19:14 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-17 07:19:14 (GMT) |
| commit | 8be000bc99de86e0aed57bfb50036eaa695308e9 (patch) | |
| tree | 9548b7a179beb2974d352720dab53727404caf91 /mkspecs/features | |
| parent | ebd0823fa2e8b1a19bff32a39c4051ba8535d501 (diff) | |
| parent | dfcf988a3f0c88f96e202482e5d363d880b9d6d2 (diff) | |
| download | Qt-8be000bc99de86e0aed57bfb50036eaa695308e9.zip Qt-8be000bc99de86e0aed57bfb50036eaa695308e9.tar.gz Qt-8be000bc99de86e0aed57bfb50036eaa695308e9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 13 |
1 files changed, 1 insertions, 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 } |