equal
deleted
inserted
replaced
13 # Remove mkspecs/common/symbian/stl-off from beginning of includepath |
13 # Remove mkspecs/common/symbian/stl-off from beginning of includepath |
14 # in order to use new and delete operators from STL |
14 # in order to use new and delete operators from STL |
15 INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off |
15 INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off |
16 |
16 |
17 # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new |
17 # libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new |
18 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { |
18 STL_LIB = -llibstdcppv5.dll |
19 LIBS *= -llibstdcppv5.dll |
|
20 |
19 |
21 # STDCPP turns on standard C++ new behaviour (ie. throwing new) |
20 # STDCPP turns on standard C++ new behaviour (ie. throwing new) |
22 MMP_RULES += "STDCPP" |
21 STL_MMP_RULE = "STDCPP" |
23 } else { |
22 |
24 LIBS *= -llibstdcpp.dll |
23 # Fall back to old implementation if that is the only one that is found |
|
24 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcpp.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) { |
|
25 !exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) { |
|
26 STL_LIB = -llibstdcpp.dll |
|
27 STL_MMP_RULE = |
|
28 } |
25 } |
29 } |
|
30 |
|
31 LIBS *= $$STL_LIB |
|
32 MMP_RULES *= $$STL_MMP_RULE |
|
33 |