diff options
| author | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
| commit | d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (patch) | |
| tree | 26a2edc99e561721fad57d27f84a2a6c0be73a3c /mkspecs | |
| parent | 6df41a9378e39f4d46cee1a085463d55fe2af5aa (diff) | |
| parent | ab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff) | |
| download | Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.zip Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.gz Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.bz2 | |
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/designer.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mkspecs/features/designer.prf b/mkspecs/features/designer.prf index 61a30cf..fa40caa 100644 --- a/mkspecs/features/designer.prf +++ b/mkspecs/features/designer.prf @@ -1,4 +1,5 @@ -QT += xml script +QT += xml +contains(QT_CONFIG, script): QT += script qt:load(qt) plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index c885bb7..b4dbc9c 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -1,13 +1,11 @@ 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 -DEFINES *= $$STLLIB_USAGE_DEFINES # Path to stlport headers INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE |