diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-08 14:35:41 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-08 14:35:41 (GMT) |
| commit | 91323ecc5b884679e04b29072508fec6e765a666 (patch) | |
| tree | f21d6803c2e6bf25c983ea4e21ff009e6d60ca05 /src/gui/embedded/qkbd_qws_p.h | |
| parent | 14e4314b5c2cfddb1e92fa1fefeaf7bea2dd6b3a (diff) | |
| parent | 4336436b8113d6a80428d70beda40a89713d04db (diff) | |
| download | Qt-91323ecc5b884679e04b29072508fec6e765a666.zip Qt-91323ecc5b884679e04b29072508fec6e765a666.tar.gz Qt-91323ecc5b884679e04b29072508fec6e765a666.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/embedded/qkbd_qws_p.h')
| -rw-r--r-- | src/gui/embedded/qkbd_qws_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/embedded/qkbd_qws_p.h b/src/gui/embedded/qkbd_qws_p.h index 3224da2..2ef1d0c 100644 --- a/src/gui/embedded/qkbd_qws_p.h +++ b/src/gui/embedded/qkbd_qws_p.h @@ -105,6 +105,7 @@ namespace QWSKeyboard { }; }; +#ifndef QT_NO_DATASTREAM inline QDataStream &operator>>(QDataStream &ds, QWSKeyboard::Mapping &m) { return ds >> m.keycode >> m.unicode >> m.qtcode >> m.modifiers >> m.flags >> m.special; @@ -124,6 +125,6 @@ inline QDataStream &operator<<(QDataStream &ds, const QWSKeyboard::Composing &c) { return ds << c.first << c.second << c.result; } - +#endif // QT_NO_DATASTREAM #endif // QWSKEYBOARD_H |