diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 07:56:02 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 07:56:02 (GMT) |
| commit | ae33eb3b934141068b3e47de3c1e1961f197408f (patch) | |
| tree | 64e3ab53913ed42049250dfa1a3f39aa3b6b8cb2 /mkspecs/features | |
| parent | 45357546c29240b95300f392084a2fe901073d85 (diff) | |
| parent | 95fdaca180de22df158ac54a282ef48e224d0e0a (diff) | |
| download | Qt-ae33eb3b934141068b3e47de3c1e1961f197408f.zip Qt-ae33eb3b934141068b3e47de3c1e1961f197408f.tar.gz Qt-ae33eb3b934141068b3e47de3c1e1961f197408f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index c01c487..b4dbc9c 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -1,10 +1,9 @@ CONFIG -= stl_off -# STL usage in S60 requires the following mmp variables to be used. -# These are added via $$STLLIB_USAGE_CW_FLAGS and $$STLLIB_USAGE_DEFINES -# variables below. -# OPTION CW -wchar_t on -# MACRO _WCHAR_T_DECLARED +# STL usage in S60 requires the "OPTION CW -wchar_t on" mmp statement to be used. +# This statement is added via $$STLLIB_USAGE_CW_FLAGS variable below. +# S60 STL documentation instructs to use also "MACRO _WCHAR_T_DECLARED" statement, +# but QtS60 will not compile if that statement is set. QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS |