diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-30 14:12:02 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-10-02 17:54:39 +0200 |
| commit | 9a3f4afb700bb4fb6c4d26120de71fb61ffab032 (patch) | |
| tree | 5d9942baad0301712beb1f462eee6c7c6ca8432f /src/gui/painting | |
| parent | a1e7c441de16cb4e8d6bdac39160759116ecd233 (diff) | |
Remove checks for features available in C++17
This patch removes most of the checks that are made using C++20
__cpp_* macros for features available in C++17 and earlier.
Library feature check macros (__cpp_lib_*) are unaffected.
Change-Id: I557b2bd0d4ff09b13837555e9880eb28e0355f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qrgba64.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/painting/qrgba64.h b/src/gui/painting/qrgba64.h index 2c644c4cf0..e326c03bfc 100644 --- a/src/gui/painting/qrgba64.h +++ b/src/gui/painting/qrgba64.h @@ -118,7 +118,6 @@ public: constexpr quint8 alpha8() const { return div_257(alpha()); } constexpr uint toArgb32() const { -#if defined(__cpp_constexpr) && __cpp_constexpr-0 >= 201304 quint64 br = rgba & Q_UINT64_C(0xffff0000ffff); quint64 ag = (rgba >> 16) & Q_UINT64_C(0xffff0000ffff); br += Q_UINT64_C(0x8000000080); @@ -136,9 +135,6 @@ public: | (ag & 0xff00) | ((br >> 32) & 0xff); #endif -#else - return uint((alpha8() << 24) | (red8() << 16) | (green8() << 8) | blue8()); -#endif } constexpr ushort toRgb16() const { |