From 3422bc3b186a32ae985d3130090b71305380bbd6 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 6 Jul 2011 09:20:45 +0200
Subject: 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>
---
 src/corelib/global/qglobal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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
 */
-- 
cgit v1.2.3