summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r--src/corelib/serialization/qdatastream.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 19188c3d91..32ccf7d6cc 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -43,6 +43,7 @@
#include <QtCore/qscopedpointer.h>
#include <QtCore/qiodevicebase.h>
#include <QtCore/qcontainerfwd.h>
+#include <QtCore/qnamespace.h>
#ifdef Status
#error qdatastream.h must be included before any header file that defines Status
@@ -510,6 +511,19 @@ inline QDataStreamIfHasOStreamOperators<T1, T2> operator<<(QDataStream& s, const
}
#endif
+inline QDataStream &operator>>(QDataStream &s, QKeyCombination &combination)
+{
+ int combined;
+ s >> combined;
+ combination = QKeyCombination::fromCombined(combined);
+ return s;
+}
+
+inline QDataStream &operator<<(QDataStream &s, QKeyCombination combination)
+{
+ return s << combination.toCombined();
+}
+
#endif // QT_NO_DATASTREAM
QT_END_NAMESPACE