diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 09:20:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-06 13:29:44 +0200 |
| commit | 3422bc3b186a32ae985d3130090b71305380bbd6 (patch) | |
| tree | c4d16f8866631180f8f27d200d4300c4075c9d79 /src | |
| parent | a97d4dcb24a9fc69ee57c5607005a4e8b85d3b32 (diff) | |
Unicode strings are supported from gcc 4.4 onwards
Change-Id: Icf3dfdb34b0a9867c69e91e5eb8400aa934f56bc
Reviewed-on: http://codereview.qt.nokia.com/1217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 204652f7c1..fda771e8ab 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -525,6 +525,7 @@ namespace QT_NAMESPACE {} # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 /* C++0x features supported in GCC 4.4: */ +# define Q_COMPILER_UNICODE_STRINGS # define Q_COMPILER_VARIADIC_TEMPLATES # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_EXTERN_TEMPLATES @@ -535,7 +536,6 @@ namespace QT_NAMESPACE {} # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 /* C++0x features supported in GCC 4.5: */ # define Q_COMPILER_LAMBDA -# define Q_COMPILER_UNICODE_STRINGS # endif # endif @@ -976,6 +976,7 @@ QT_END_INCLUDE_NAMESPACE #error "Compiler doesn't support the bool type" #endif + /* Constant bool values */ |