diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:54:57 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:54:57 +0100 |
| commit | ce27cf24539e0c7971937e55d8539496ad51ee52 (patch) | |
| tree | 86ddea82eca7e682409cbc2c568594a0116062c6 /src/corelib/xml | |
| parent | 6f44020cf97bd74e02ee011e6cb182aa93109b21 (diff) | |
| parent | 1f10c6be975a2d36c05d926b332b869ad6339877 (diff) | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/corelib/xml')
| -rw-r--r-- | src/corelib/xml/qxmlstream_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h index 6b911d2217..ac421cf8b0 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/xml/qxmlstream_p.h @@ -54,7 +54,7 @@ #ifndef QXMLSTREAM_P_H #define QXMLSTREAM_P_H -#if defined(Q_OS_VXWORKS) && defined(ERROR) +#if defined(ERROR) # undef ERROR #endif |