diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 05:42:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 05:42:14 (GMT) |
| commit | ed604d1a6420c1e6598b7d509dd108aa20db4509 (patch) | |
| tree | 41b2a590ba25cee8c88fd5b69ad53f8169d24f47 /src/corelib | |
| parent | 0f01ad8c73e352a8368296820f4dd77f9da06114 (diff) | |
| parent | e3db2e423f38c254331674360e4dded1d7fc1d60 (diff) | |
| download | Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.zip Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.tar.gz Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.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:
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
Factored readRegistryKey implementation out of qmake
QWebView scrolling doesn't clear old elements before painting again
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 |