diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 12:35:35 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-03 10:54:44 +0200 |
| commit | 257d5888e8086e6fcea87f68bb06feb56cd830d6 (patch) | |
| tree | ae83cd2a6e9ade85ab32b03806888ab1c7a899e7 /src/corelib/global | |
| parent | 1907599bfd817e00c7f42b8cb941ebf93a098e7f (diff) | |
QFlags: remove deprecated constructor
Fix remaining places that still exercised it.
Task-number: QTBUG-85700
Change-Id: I84562f53439197141343831c0b9f88983689e6bf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qflags.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index e576128bce..ded933880e 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -93,10 +93,6 @@ class QFlags "long long will overflow."); static_assert((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types."); -#if QT_DEPRECATED_SINCE(5,15) - struct Private; - typedef int (Private::*Zero); -#endif public: #if defined(Q_CC_MSVC) || defined(Q_CLANG_QDOC) // see above for MSVC @@ -117,9 +113,6 @@ public: #endif constexpr inline QFlags() noexcept : i(0) {} constexpr inline QFlags(Enum flags) noexcept : i(Int(flags)) {} -#if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_X("Use default constructor instead") constexpr inline QFlags(Zero) noexcept : i(0) {} -#endif constexpr inline QFlags(QFlag flag) noexcept : i(flag) {} constexpr inline QFlags(std::initializer_list<Enum> flags) noexcept |