summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-02-08 12:46:13 (GMT)
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-02-08 12:46:13 (GMT)
commitaf76a0b5ddc7af8515b9430b6842d5afd49ea940 (patch)
tree1707d651ece3b4a4f65015d21280e8cc396d5e03 /src
parent5f6456d420a762cf935271c9329178ad7112c4a1 (diff)
downloadQt-af76a0b5ddc7af8515b9430b6842d5afd49ea940.zip
Qt-af76a0b5ddc7af8515b9430b6842d5afd49ea940.tar.gz
Qt-af76a0b5ddc7af8515b9430b6842d5afd49ea940.tar.bz2
re-enable QT_USE_FAST_CONCATENATION
includes workaround for breakage with old g++
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/parser/qmljsgrammar_p.h2
1 files changed, 1 insertions, 1 deletions
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,