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

Revert "compile everything with QT_USE_FAST_CONCATENATION"

Browse Source 
This reverts commit e70530c5ad. 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???
...
This commit is contained in:
Kai Koehne
2010-02-08 10:56:50 +01:00
parent b58cb740e5
commit 999c73ad9d
9 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -438,8 +438,7 @@ void MSVCToolChain::addToEnvironment(ProjectExplorer::Environment &env)
return;
QString filename = tf.fileName();
tf.write("call \"" + varsbat.toLocal8Bit()+"\"\r\n");
QString redirect = "set > \"" + QDir::tempPath() + "\\qtcreator-msvc-environment.txt\"\r\n";
tf.write(redirect.toLocal8Bit());
tf.write(("set > \"" + QDir::tempPath() + "\\qtcreator-msvc-environment.txt\"\r\n").toLocal8Bit());
tf.flush();
tf.waitForBytesWritten(30000);