Make the operator| for QUrl with QIncompatibleFlag constexpr.

Change-Id: I7780af7ef0d5e191e2715c40bf0ffbb6d376f1a2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 5096d9c..7e69479 100644 (file)
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -337,7 +337,7 @@ Q_DECL_CONSTEXPR inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOpt
 { return QUrl::FormattingOptions(f1) | f2; }
 Q_DECL_CONSTEXPR inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption f1, QUrl::FormattingOptions f2)
 { return f2 | f1; }
-inline QIncompatibleFlag operator|(QUrl::UrlFormattingOption f1, int f2)
+Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(QUrl::UrlFormattingOption f1, int f2)
 { return QIncompatibleFlag(int(f1) | f2); }
 
 // add operators for OR'ing the two types of flags