diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
| commit | fc007d0a99cc52e673c5d2606e5076831f6103b1 (patch) | |
| tree | 5ad98ad0fa614b9becf21f2419adb633666028c9 /mkspecs | |
| parent | f4ee70e849759adc710a56cf25e08a32b8250ebd (diff) | |
| parent | acc84a9d0d3427155298db3a8c0ad406d078de0e (diff) | |
| download | Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.zip Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.gz Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Check S60_VERSION instead of existence of certain files in bearer plugin
Fixed EPOCROOT references in createpackage.pl.
Restore 4.7.0 behavior that non-existing paths are possible.
QTBUG-4852 Turning on runtime nested exception support where available
Fix warnings
Fixed incorrect Symbian scoping.
QS60style: itemview selection indication works incorrectly
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/nested_exceptions.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/nested_exceptions.prf b/mkspecs/features/symbian/nested_exceptions.prf new file mode 100644 index 0000000..defca94 --- /dev/null +++ b/mkspecs/features/symbian/nested_exceptions.prf @@ -0,0 +1,4 @@ +# use nested exceptions runtime support for apps +contains(TEMPLATE, app) { + MMP_RULES *= EPOCNESTEDEXCEPTIONS +} diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 2a3bce4..65d4b93 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -36,3 +36,8 @@ equals(use_libstdcppv5, true) { } else { LIBS *= -llibstdcpp.dll } + +# use the runtime support for nested exceptions, if a library is available +exists($${EPOCROOT}epoc32/release/armv5/urel/usrt_nx_*.lib) { + CONFIG += nested_exceptions +} |