From af76a0b5ddc7af8515b9430b6842d5afd49ea940 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 8 Feb 2010 13:46:13 +0100
Subject: re-enable QT_USE_FAST_CONCATENATION

includes workaround for breakage with old g++
---
 src/declarative/qml/parser/qmljsgrammar_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/parser/qmljsgrammar_p.h b/src/declarative/qml/parser/qmljsgrammar_p.h
index 903e2c4..c2e2693 100644
--- a/src/declarative/qml/parser/qmljsgrammar_p.h
+++ b/src/declarative/qml/parser/qmljsgrammar_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class QmlJSGrammar
 {
 public:
-  enum {
+  enum VariousConstants {
     EOF_SYMBOL = 0,
     REDUCE_HERE = 99,
     SHIFT_THERE = 98,
-- 
cgit v0.12