From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 13 Jul 2012 18:40:09 +0000 (+0200)
Subject: Make the QIncompatibleFlag constexpr.
X-Git-Tag: v5.0.0-beta1~727
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27508324106da02c7fddb066801f40d1428d1437;p=profile%2Fivi%2Fqtbase.git

Make the QIncompatibleFlag constexpr.

Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---

diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index d3e812a..b578177 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -62,11 +62,11 @@ class QIncompatibleFlag
 {
     int i;
 public:
-    inline explicit QIncompatibleFlag(int i);
+    Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i);
     inline operator int() const { return i; }
 };
 
-inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {}
+Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int ai) : i(ai) {}
 
 
 #ifndef Q_NO_TYPESAFE_FLAGS
@@ -114,7 +114,7 @@ public:
 typedef QFlags<Enum> Flags;
 
 #define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \
-inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \
+Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \
 { return QIncompatibleFlag(int(f1) | f2); }
 
 #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \