From d3ff621a579e62a2c772137e79bb9ee16f8dce48 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 10 Jul 2012 13:57:51 +0200 Subject: make gui compile with QT_NO_SHORTCUT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The metatype system expects operator<<(QDataStream &, QKeySequence &) even when shortcuts are disabled. This provides empty definitions for that case. Task-number: QTBUG-24816 Change-Id: Ie29fd01d38178bdc31cc51f1f08662b30edfc1e4 Reviewed-by: Jędrzej Nowacki --- src/gui/kernel/qkeysequence.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 4e0f1dfbff..64515af7a9 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -227,6 +227,11 @@ public: QKeySequence(int) {} }; +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks) {} +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QKeySequence &ks) {} +#endif /* #ifndef QT_NO_DATASTREAM */ + #endif // QT_NO_SHORTCUT QT_END_NAMESPACE -- cgit v1.2.3