diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-02-08 10:56:50 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-02-08 10:56:50 +0100 |
commit | 999c73ad9daf23a4883f76b87d0aaf43d9032629 (patch) | |
tree | 99aa61d9eb0efa425914ed483a2a8446cfb356e5 /qtcreator.pri | |
parent | b58cb740e5e08f7a11a7b176a97351bf49b0d52a (diff) | |
download | qt-creator-999c73ad9daf23a4883f76b87d0aaf43d9032629.tar.gz |
Revert "compile everything with QT_USE_FAST_CONCATENATION"
This reverts commit e70530c5ad85c1c44fca99be04d5e37043d3baca. It
did break builds on older gcc versions (gcc 4.1.2 64 bit Linux,
gcc 4.0.1 on Mac OS X):
parser/qmljsgrammar_p.h: In static member function ???static int
QmlJSGrammar::nt_action(int, int)???:
parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>???
is/uses anonymous type
parser/qmljsgrammar_p.h:188: error: trying to instantiate
???template<class T> struct QConcatenable???
...
Diffstat (limited to 'qtcreator.pri')
-rw-r--r-- | qtcreator.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 07611f26b5..b78da8fa12 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -90,7 +90,8 @@ 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 +#DEFINES += QT_USE_FAST_CONCATENATION unix { CONFIG(debug, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared |