diff options
| -rw-r--r-- | mkspecs/common/symbian/stl-off/new | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/mkspecs/common/symbian/stl-off/new b/mkspecs/common/symbian/stl-off/new index 3939e11..8584ba3 100644 --- a/mkspecs/common/symbian/stl-off/new +++ b/mkspecs/common/symbian/stl-off/new @@ -1,4 +1,4 @@ -// new implemented in symbian libs, do nothing here, just keep Qt happpy +// 'new' implemented in symbian libs, so do nothing here; just keep Qt happy #ifndef __NEW_SYMB_ADDON #define __NEW_SYMB_ADDON #include <e32base.h> diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index db2ea14..dd4a4d5 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -6,6 +6,9 @@ CONFIG += qtmain load(qt) +# Add dependency to QtLibs package to all other projects besides QtLibs. +# Note: QtLibs with full capabilities has UID3 of 0x2001E61C, +# while self-signed version typically has temporary UID3 of 0xE001E61C. contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) { default_deployment.pkg_prerules += \ "; Default dependency to Qt libraries" \ diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 9eb6b86..c885bb7 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -1,14 +1,15 @@ CONFIG -= stl_off -# STL usage in S60 requires the following mmp variables to be uses +# 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 QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS DEFINES *= $$STLLIB_USAGE_DEFINES -# Legacy support requires some hardcoded stdapis paths. -# Note: Also the new header is used from STL when it is enabled +# Path to stlport headers INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE # Remove mkspecs/common/symbian/stl-off from beginning of includepath |