diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-25 15:46:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 17:32:21 +0200 |
| commit | bdab182bd0fcb352b178db646992ea1ff8a48834 (patch) | |
| tree | 6300211823dba42ac2e549627f2fcf16f0ad09b0 /src/corelib/io/qurl.h | |
| parent | 563875bf29f9d6a573c10fd40a30bb0f552ab8d3 (diff) | |
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>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 5096d9c1d9..7e694799cc 100644 --- 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 |