diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 20:08:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 20:08:08 (GMT) |
| commit | 1a8fffa8cae5b4094adcd87bfc4cbc24599d7305 (patch) | |
| tree | 2395a3bc3ba571b7a483f7cd1c86c6e9f0852dbc /src/corelib | |
| parent | e4094573595ba085ccbd9d968fa87e988c5bfc5b (diff) | |
| parent | ee395a5b2f9e0d5f26884dbf40d06f3df7671282 (diff) | |
| download | Qt-1a8fffa8cae5b4094adcd87bfc4cbc24599d7305.zip Qt-1a8fffa8cae5b4094adcd87bfc4cbc24599d7305.tar.gz Qt-1a8fffa8cae5b4094adcd87bfc4cbc24599d7305.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (22 commits)
use egl properties when creating surfaces on symbian
work around the current include file structure on Symbian^3
Get rid of the dependency on the Symbian app layer
Fix incorrect license headers
Fix incorrect license headers
Supressed Icon sizes on QPushButton in QS60Style
Fixed libstdcpp.dll version autodetection for Symbian
Fixed linkage failure when building qmake on Unix platforms
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
ColorDialog is always shown as stripped-down version (for QVGA)
Virtual keyboard can't be closed anymore after tapping the text area
Revert "Factored readRegistryKey implementation out of qmake"
Revert "Factored epocRoot implementation out of qmake"
Pass QAudioDeviceInfo when creating audio input/output in examples
Symbian backend for QtMultimedia audio
Modified configure to detect SDK support for Symbian audio backend
Added implementation of epocRoot() function to configure
Removed duplicated implementation of readRegistryKeys from configure
Factored epocRoot implementation out of qmake
...
Diffstat (limited to 'src/corelib')
| -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 6b911d2..ac421cf 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 |