diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 17:02:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 17:02:50 (GMT) |
| commit | db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d (patch) | |
| tree | 3327f1ddf2859df97b98265bd16472650e0e66a5 /util/qlalr/cppgenerator.cpp | |
| parent | 01c26e837617d494ecb06a11fc7c9eb628e1b75b (diff) | |
| parent | ab5c902908861a084f60bc1bceba8a98289ce723 (diff) | |
| download | Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.zip Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.tar.gz Qt-db2d0f1d5d6a3409e5e43d3fdd17ddbb8e1b553d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix crash in QXmlStreamReader
Diffstat (limited to 'util/qlalr/cppgenerator.cpp')
| -rw-r--r-- | util/qlalr/cppgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index f52a86f..45de51c 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -355,7 +355,7 @@ void CppGenerator::operator () () out << startIncludeGuard(grammar.merged_output) << endl; if (copyright) { - out << "#if defined(Q_OS_VXWORKS) && defined(ERROR)" << endl + out << "#if defined(ERROR)" << endl << "# undef ERROR" << endl << "#endif" << endl << endl; } |