From 399b591b5cd05d8ac4700c45b0531aa0da7d69a2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 13 Aug 2012 11:01:57 +0200 Subject: Deprecate Qt::WFlags. It seems to date from the Qt 1 days, and such abbreviations are not current Qt style. Change-Id: Iea7259bd7ba78b2c0863e3f6675e10826712ffd9 Reviewed-by: Andy Shaw Reviewed-by: Lars Knoll --- src/corelib/global/qnamespace.h | 2 ++ src/corelib/global/qnamespace.qdoc | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 50f43e3c78..a302c8ce51 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1410,7 +1410,9 @@ public: Q_DECLARE_FLAGS(MatchFlags, MatchFlag) typedef void * HANDLE; +#if QT_DEPRECATED_SINCE(5, 0) typedef WindowFlags WFlags; +#endif enum WindowModality { NonModal, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 41a9af28bb..338edc595b 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1863,6 +1863,8 @@ /*! \typedef Qt::WFlags + \obsolete + This typedef is obsolete. Use Qt::WindowFlags instead. Synonym for Qt::WindowFlags. */ -- cgit v1.2.3