feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

re-enable QT_USE_FAST_CONCATENATION

Browse Source 
includes workaround for breakage with old g++
This commit is contained in:
Oswald Buddenhagen
2010-02-08 12:59:12 +01:00
parent e5c80fba6b
commit d4ac9c9f8e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qtcreator.pri
View File

@@ -90,7 +90,7 @@ LIBS += -L$$IDE_LIBRARY_PATH
#DEFINES += QT_NO_CAST_FROM_ASCII #DEFINES += QT_NO_CAST_FROM_ASCII
DEFINES += QT_NO_CAST_TO_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 { unix {
CONFIG(debug, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared CONFIG(debug, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared

2
src/libs/qmljs/parser/qmljsgrammar_p.h
View File

@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
class QmlJSGrammar class QmlJSGrammar
{ {
public: public:
enum { enum VariousConstants {
EOF_SYMBOL = 0, EOF_SYMBOL = 0,
REDUCE_HERE = 99, REDUCE_HERE = 99,
SHIFT_THERE = 98, SHIFT_THERE = 98,