summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-17 13:24:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-17 21:28:11 +0100
commit34304e3100883187ca658b8c983af21549496b43 (patch)
tree5c2e8216740e4ad4e9efc6010539c3a6cfbbbf8e /src/corelib/global/qnamespace.h
parent1e9dc3ec2f254c711149f8c0376f0403df9b4650 (diff)
Get rid of Q_COMPILER_CONSTEXPR checks
Is required now. Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r--src/corelib/global/qnamespace.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 157928c958..0a4f025d6a 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1601,16 +1601,10 @@ namespace Qt {
TitleBarArea // For move
};
-#if defined(Q_COMPILER_CONSTEXPR)
enum class Initialization {
Uninitialized
};
- [[maybe_unused]] static constexpr Initialization Uninitialized = Initialization::Uninitialized;
-#else
- enum Initialization {
- Uninitialized
- };
-#endif
+ [[maybe_unused]] static inline constexpr Initialization Uninitialized = Initialization::Uninitialized;
enum CoordinateSystem {
DeviceCoordinates,