diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
| commit | 9093368f33ddc422047103a89effcd40338b4dbc (patch) | |
| tree | 78c9660b403214de7ba793c9b06bbb0b65cd5eac /mkspecs | |
| parent | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff) | |
| parent | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff) | |
| download | Qt-9093368f33ddc422047103a89effcd40338b4dbc.zip Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/fixed_stdlib.h | 8 | ||||
| -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 |
4 files changed, 12 insertions, 8 deletions
diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/mkspecs/common/symbian/fixed_stdlib.h index a6dcbc7..f8dc138 100644 --- a/mkspecs/common/symbian/fixed_stdlib.h +++ b/mkspecs/common/symbian/fixed_stdlib.h @@ -49,16 +49,16 @@ // If _WCHAR_T_DECLARED is defined, undef it and store information that we // need to revert the _WCHAR_T_DECLARED define after include # ifdef _WCHAR_T_DECLARED -# define REVERT_WCHAR_T_DECLARED +# define QT_REVERT_WCHAR_T_DECLARED # undef _WCHAR_T_DECLARED # endif //_WCHAR_T_DECLARED #include <stdlib.h> // Revert _WCHAR_T_DECLARED if necessary -# ifdef REVERT_WCHAR_T_DECLARED +# ifdef QT_REVERT_WCHAR_T_DECLARED # define _WCHAR_T_DECLARED -# undef REVERT_WCHAR_T_DECLARED -# endif //REVERT_WCHAR_T_DECLARED +# undef QT_REVERT_WCHAR_T_DECLARED +# endif //QT_REVERT_WCHAR_T_DECLARED #endif 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 6d7426b..c01c487 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -1,13 +1,14 @@ 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 -# 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 |