diff --git a/qtcreator.pri b/qtcreator.pri index 6a59fe91f199b1ab1a7d90d6cb4f4db757fefd73..31d03a5950109a37e7a8e936f46d899923f467f0 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 903e2c4dab63e78f04b7149dba4ff716490f89cb..c2e26935737ee862f25df65e4d62bcc59ec3d54d 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,