diff options
| author | Iain <qt-info@nokia.com> | 2009-08-20 12:43:42 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-20 12:43:42 (GMT) |
| commit | 2c9a25772725893127d1f81613a8b42af46d9f40 (patch) | |
| tree | b7e6e01998687842ade07f5ecc907cb54e642408 /mkspecs/common | |
| parent | 88b41e99fbb8c526d78da89bb4dbc34e496bd6f8 (diff) | |
| parent | adc732da98be7c2c13ffafaf6535e3cc47ebc0c3 (diff) | |
| download | Qt-2c9a25772725893127d1f81613a8b42af46d9f40.zip Qt-2c9a25772725893127d1f81613a8b42af46d9f40.tar.gz Qt-2c9a25772725893127d1f81613a8b42af46d9f40.tar.bz2 | |
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/fixed_stdlib.h | 10 | ||||
| -rw-r--r-- | mkspecs/common/symbian/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/common/symbian/stl-off/new | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/mkspecs/common/symbian/fixed_stdlib.h index 82ad45d..f8dc138 100644 --- a/mkspecs/common/symbian/fixed_stdlib.h +++ b/mkspecs/common/symbian/fixed_stdlib.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h index db5f461..b459cef 100644 --- a/mkspecs/common/symbian/qplatformdefs.h +++ b/mkspecs/common/symbian/qplatformdefs.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ 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> |