From d4ac9c9f8e8585fbcf3c605b3d5f9b537dfce4d9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 8 Feb 2010 12:59:12 +0100
Subject: [PATCH] re-enable QT_USE_FAST_CONCATENATION
includes workaround for breakage with old g++
---
qtcreator.pri | 2 +-
src/libs/qmljs/parser/qmljsgrammar_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index 6a59fe91f19..31d03a59501 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -90,7 +90,7 @@ LIBS += -L$$IDE_LIBRARY_PATH
#DEFINES += QT_NO_CAST_FROM_ASCII
DEFINES += QT_NO_CAST_TO_ASCII
-#DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
+DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
unix {
CONFIG(debug, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
index 903e2c4dab6..c2e26935737 100644
--- a/src/libs/qmljs/parser/qmljsgrammar_p.h
+++ b/src/libs/qmljs/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,
--
GitLab