diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:41:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:41:40 (GMT) |
| commit | 5c4234aa7499d879f50d1475aff8cce7d3ff6c11 (patch) | |
| tree | 10c930f9d1526cb2bc779469e7b97cebc21619a0 /mkspecs/features | |
| parent | d05f83919949fd9604e6d96858a8404c9a580def (diff) | |
| parent | c9d73831910d4959e17899497335bd7fc4e08935 (diff) | |
| download | Qt-5c4234aa7499d879f50d1475aff8cce7d3ff6c11.zip Qt-5c4234aa7499d879f50d1475aff8cce7d3ff6c11.tar.gz Qt-5c4234aa7499d879f50d1475aff8cce7d3ff6c11.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits)
Doc: these files are NOT part of the test suite of the Qt toolkit
Autotest: make the licenseCheck test also check .qdoc files
use egl properties when creating surfaces on symbian
work around the current include file structure on Symbian^3
Get rid of the dependency on the Symbian app layer
Fix incorrect license headers
Fix incorrect license headers
tst_qnetworkreply: Check if TCP/HTTP connection got re-used
Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
Fix building in a namespace on Windows
Supressed Icon sizes on QPushButton in QS60Style
Ensure that posted events are sent on Windows
Fixed off-by-one blending errors in the NEON drawhelper code.
Fixed libstdcpp.dll version autodetection for Symbian
Fixed linkage failure when building qmake on Unix platforms
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
Cetest extensions for Windows Mobile device power operations.
Remote lib extensions for Windows Mobile device power operations.
ColorDialog is always shown as stripped-down version (for QVGA)
...
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 |