diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-13 11:01:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 10:10:44 +0200 |
| commit | 399b591b5cd05d8ac4700c45b0531aa0da7d69a2 (patch) | |
| tree | 16ff029d0904d2f58d513aba83eaa4a6bd14c854 /src/corelib | |
| parent | 0b0e28997d5c0ec6fbffa839b0ceb57b55104f9c (diff) | |
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 <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
2 files changed, 4 insertions, 0 deletions
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. */ |